Skip to content

D
dd_school
Commit 4e121f8a by zhaopanyu
Options

zpy 8.9

parent a861ed05
Showing with 75 additions and 90 deletions
ruoyi-ui/src/views/smartSchool/schoolProperty/classiFication/index.vue
......@@ -25,7 +25,7 @@
</el-col>
</el-row>
<!-- 表单数据 -->
<el-table v-if="refreshTable" :data="assetsList" v-loading="loading" row-key="id" :default-expand-all="isExpandAll"
<el-table :data="assetsList" v-loading="loading" row-key="id" :default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column label="分类编码" header-align="center" prop="typeName"></el-table-column>
<el-table-column label="设备分类" align="center" prop="typeNum"></el-table-column>
......@@ -46,7 +46,7 @@
</el-table-column>
</el-table>
<!-- 新增/修改弹出框 -->
<el-dialog width="40%" :visible.sync="open" :title="title" append-to-body @close="cancel">
<el-dialog width="50%" :visible.sync="open" :title="title" append-to-body>
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-row>
<el-col :span="12">
......@@ -60,7 +60,7 @@
<el-form-item label="设备分类" prop="typeNum">
<el-select v-model="postForm.typeNum" placeholder="请选择设备分类" clearable style="width: 100%;">
<el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '206.66px' }" />
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
......@@ -70,7 +70,7 @@
<el-form-item label="型号" prop="typeOrder">
<el-select v-model="postForm.typeOrder" placeholder="请选择型号" clearable style="width: 100%;">
<el-option v-for="item in xhOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
......@@ -90,7 +90,7 @@
</div>
</el-dialog>
<!-- 查看弹出框 -->
<el-dialog width="800px" :visible.sync="openLook" :title="title" append-to-body @close="cancel">
<el-dialog width="800px" :visible.sync="openLook" :title="title" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row>
<el-col :span="12">
......@@ -102,9 +102,9 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备分类" prop="typeNum">
<el-select v-model="form.typeNum" placeholder="请选择设备分类" clearable>
<el-select v-model="form.typeNum" placeholder="请选择设备分类" clearable :style="{ width: '100%' }">
<el-option v-for="item in sbflOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '206.66px' }" />
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
......@@ -112,9 +112,9 @@
<el-row>
<el-col :span="12">
<el-form-item label="型号" prop="typeOrder">
<el-select v-model="form.typeOrder" placeholder="请选择型号" clearable>
<el-select v-model="form.typeOrder" placeholder="请选择型号" clearable :style="{ width: '100%' }">
<el-option v-for="item in xhOptions" :key="item.value" :label="item.label"
:value="item.value" :style="{ width: '100%' }" />
:value="item.value" />
</el-select>
</el-form-item>
</el-col>
......@@ -178,7 +178,7 @@ import {
} from '@/api/smartSchool/logisticsManage/assetsClassification.js'
export default {
name: "AssetsClassification",
name: "classiFication",
dicts: ["vehicle_type", "vehicle_state"],
data() {
return {
......@@ -220,7 +220,7 @@ export default {
sbflOptions: [],
// 遮罩层
loading: false,
// 资产信息列表
// 列表
assetsList: [],
// 新增/修改表单
postForm: {},
......@@ -239,7 +239,7 @@ export default {
// 校验规则
rules: {
typeName: [{ required: true, message: '资产分类不能为空', trigger: 'blur' }],
typeNum: [{ required: true, message: '资产编号不能为空', trigger: 'blur' }],
// typeNum: [{ required: true, message: '资产编号不能为空', trigger: 'blur' }],
},
}
......@@ -343,6 +343,7 @@ export default {
handleAdd(row) {
this.reset();
if (row != null && row.id) {
console.log(row, row.id);
this.postForm.pid = row.id;
} else {
this.postForm.pid = 0;
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
......@@ -23,15 +23,15 @@
:value="dict.value" />
</el-select>
</el-form-item>
<el-button class="ml20" type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索
</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</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">新增
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">入库
</el-button>
<el-button type="danger" plain icon="el-icon-minus" size="mini" @click="handleDelete">出库
</el-button>
</el-col>
<el-col :span="1.5">
......@@ -46,59 +46,51 @@
<el-button type="warning" icon="el-icon-printer" size="mini" @click="printBarcodes">批量打印条码</el-button>
</el-col>
</el-row>
<el-table v-loading="loading" stripe :data="ClassList" :cell-style="{ padding: '5px' }"
@selection-change="handleSelectionChange" width="100%">
<!-- 表单数据 -->
<el-table v-loading="loading" stripe :data="ClassList" @selection-change="handleSelectionChange" width="100%">
<el-table-column type="selection" width="55" align="center" />
<el-table-column header-align="center" align="center" type="index" width="50" />
<el-table-column header-align="center" align="center" prop="equipmentCode" label="自编码" min-width="80"
<el-table-column header-align="center" align="center" type="index" label="序号" width="55" fixed="left" />
<el-table-column header-align="center" align="center" prop="equipmentCode" fixed="left" label="自编码" width="120"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentName" label="设备名称" min-width="80"
<el-table-column header-align="center" align="center" prop="equipmentName" fixed="left" label="设备名称"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentModel" label="型号" min-width="80"
<el-table-column header-align="center" align="center" prop="equipmentModel" fixed="left" label="型号"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentSpec" label="规格" min-width="80"
<el-table-column header-align="center" align="center" prop="equipmentSpec" fixed="left" label="规格"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentTypeCode" label="分类编码" min-width="80"
<el-table-column header-align="center" align="center" prop="equipmentTypeCode" label="分类编码"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentUnit" label="单位" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="equipmentUnit" label="单位" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="belongType" label="归属类型" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="belongType" label="归属类型" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentStatus" label="设备状态" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="equipmentStatus" label="设备状态" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="isAllowBorrow" label="是否允许借出" min-width="80"
<el-table-column header-align="center" align="center" prop="isAllowBorrow" label="是否允许借出" width="120px"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="isBorrow" label="是否借出" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="isBorrow" label="是否借出" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="productionDate" label="投产日期" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="productionDate" label="投产日期" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentPrice" label="价格（元）" min-width="80"
<el-table-column header-align="center" align="center" prop="equipmentPrice" label="价格（元）" width="120px"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="usefulLife" label="效用年限（年）" min-width="80"
<el-table-column header-align="center" align="center" prop="usefulLife" label="效用年限（年）" width="120px"
show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentPlace" label="地点" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="equipmentPlace" label="地点" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="equipmentUser" label="使用人" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="equipmentUser" label="使用人" show-overflow-tooltip>
</el-table-column>
<el-table-column header-align="center" align="center" prop="remark" label="备注" min-width="80"
show-overflow-tooltip>
<el-table-column header-align="center" align="center" prop="remark" label="备注" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" align="center" min-width="250px" fixed="right">
<el-table-column label="操作" align="center" min-width="220px" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:grade:edit']">编辑
......@@ -107,23 +99,20 @@
v-hasPermi="['system:grade:edit']">查看
</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:grade:remove']">删除
v-hasPermi="['system:grade:remove']">出库
</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改学校班级对话框 -->
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="dialogVisibleforClass" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" :disabled="!isEdit" label-width="140px">
<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-input v-model="form.teacherName" placeholder="请输入自编码" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -166,21 +155,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="设备状态:">
<el-select v-model="queryParams.equipmentStatus" @keyup.enter.native="handleQuery" clearable
placeholder="请选择设备状态" style="width: 100%;">
<el-select v-model="queryParams.equipmentStatus" clearable placeholder="请选择设备状态"
style="width: 100%;">
<el-option v-for="dict in dict.type.EquipmentStatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="是否允许借出:" prop="equipmentIsBorrow">
<el-select v-model="queryParams.equipmentIsBorrow" @keyup.enter.native="handleQuery" clearable
placeholder="请选择是否允许借出" style="width: 100%;">
<el-select v-model="queryParams.equipmentIsBorrow" clearable placeholder="请选择是否允许借出"
style="width: 100%;">
<el-option v-for="dict in dict.type.EquipmentIsBorrow" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
......@@ -188,8 +175,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="是否借出:" prop="equipmentIsBorrow">
<el-select v-model="queryParams.equipmentIsBorrow" @keyup.enter.native="handleQuery" clearable
placeholder="请选择是否借出" style="width: 100%;">
<el-select v-model="queryParams.equipmentIsBorrow" clearable placeholder="请选择是否借出"
style="width: 100%;">
<el-option v-for="dict in dict.type.EquipmentIsBorrow" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
......@@ -348,7 +335,7 @@ export default {
methods: {
/** 查询学校班级列表 */
/** 查询列表 */
getList() {
this.loading = true;
getClassList(this.queryParams).then((response) => {
......@@ -395,11 +382,11 @@ export default {
this.multiple = !selection.length;
},
/** 新增班级按钮操作 */
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.dialogVisibleforClass = true;
this.title = "添加班级信息";
this.title = "新增";
},
/** 修改按钮操作 */
handleUpdate(row) {
......@@ -410,11 +397,25 @@ export default {
this.$modal.closeLoading();
this.form = response.data;
this.dialogVisibleforClass = true;
this.title = "修改班级信息";
this.title = "修改";
}).catch(error => {
this.$modal.closeLoading();
})
},
//出库按钮操作
// handleOut(row) {
// this.reset();
// const id = row.id || this.ids;
// this.$modal.loading('正在加载数据，请稍等...');
// getDetailInfo(id).then((response) => {
// this.$modal.closeLoading();
// this.form = response.data;
// this.dialogVisibleforOut = true;
// this.title = "出库";
// }).catch(error => {
// this.$modal.closeLoading();
// })
// },
/** 上传过程 */
handleFileUploadProgress() {
this.upload.isUploading = true;
......@@ -437,7 +438,7 @@ export default {
this.$modal.closeLoading();
this.form = response.data;
this.dialogVisibleforClass = true;
this.title = "班级详情";
this.title = "查看详情";
this.isEdit = false;
}).catch(error => {
this.$modal.closeLoading();
......@@ -447,13 +448,11 @@ export default {
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
// 将年级和班级信息赋值
this.handleBaseInfo();
this.$modal.loading('正在上传数据，请稍等...');
if (this.form.id != null) {
editClass(this.form).then((response) => {
this.$modal.closeLoading();
this.$modal.msgSuccess("修改班级成功");
this.$modal.msgSuccess("修改成功");
this.dialogVisibleforClass = false;
this.getList();
}).catch(error => {
......@@ -465,7 +464,7 @@ export default {
gradeType: 4
}).then((response) => {
this.$modal.closeLoading();
this.$modal.msgSuccess("新增班级成功");
this.$modal.msgSuccess("新增成功");
this.dialogVisibleforClass = false;
this.getList();
}).catch(error => {
......@@ -484,12 +483,12 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除所选班级？').then(() => {
this.$modal.loading('正在删除，请稍等...');
this.$modal.confirm('是否确认出库？').then(() => {
this.$modal.loading('正在出库，请稍等...');
return deleteClass(ids);
}).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess("删除班级成功");
this.$modal.msgSuccess("出库成功");
this.getList();
}).catch(error => {
this.$modal.closeLoading();
......@@ -516,40 +515,25 @@ export default {
this.dialogVisibleforBatch = false;
this.reset();
},
submitFormForBatch() {
console.log("点击提交")
this.$refs["form"].validate((valid) => {
if (valid) {
this.$modal.loading('正在上传数据，请稍等...');
editBatch(this.form).then((response) => {
this.$modal.closeLoading();
this.$modal.msgSuccess("批量修改成功");
this.dialogVisibleforBatch = false;
this.getList();
}).catch(error => {
this.$modal.closeLoading();
})
}
});
},
// 下载班级模板
// 下载模板
importTemplate() {
this.download(
"/schoolClass/importTemplate",
{},
`班级管理.xlsx`
`设备台帐.xlsx`
);
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "班级导入";
this.upload.title = "导入";
this.upload.open = true;
},
/** 导出班级按钮操作 */
/** 导出按钮操作 */
handleExportClass() {
const length = this.ids.length;
const ids = this.ids;
......@@ -559,7 +543,7 @@ export default {
{
...this.queryParams,
},
`班级管理.xlsx`
`设备台帐.xlsx`
);
} else {
this.download(
......
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