Skip to content

D
dd_school
Commit 7ad8e234 by wangjian
Options

Merge remote-tracking branch 'origin/master'

parents bb09efff 86c2163f
Showing with 379 additions and 168 deletions
ruoyi-ui/drawingDefault.js 0 → 100644
export default [
{
layout: 'colFormItem',
tagIcon: 'input',
label: '手机号',
vModel: 'mobile',
formId: 6,
tag: 'el-input',
placeholder: '请输入手机号',
defaultValue: '',
span: 24,
style: { width: '100%' },
clearable: true,
prepend: '',
append: '',
'prefix-icon': 'el-icon-mobile',
'suffix-icon': '',
maxlength: 11,
'show-word-limit': true,
readonly: false,
disabled: false,
required: true,
changeTag: true,
regList: [{
pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
message: '手机号格式错误'
}]
}
]
ruoyi-ui/src/views/login.vue
......@@ -25,7 +25,7 @@
</div>
<div class="login-card-right">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <h3 class="title">智慧校园管理系统</h3>-->
<!-- <h3 class="title">智慧校园管理系统</h3>-->
<h3 class="title">智慧校园管理系统</h3>
<el-form-item prop="phonenumber">
<el-input v-model="loginForm.phonenumber" type="text" auto-complete="off" placeholder="手机号码">
......@@ -68,7 +68,7 @@
</div>
<!-- 底部 -->
<div class="el-login-footer">
<!-- <span>© 2021 zhimin Copyright </span>-->
<!-- <span>© 2021 zhimin Copyright </span>-->
</div>
</div>
</template>
......
ruoyi-ui/src/views/smartSchool/electronicArchives/examinationScore/index.vue
......@@ -15,8 +15,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="queryParams.sub" clearable placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -52,7 +52,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="高考评优" prop="gkAppraising">
<el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择" style="width: 100%">
<el-select v-model="queryParams.gkAppraising" clearable placeholder="请选择"
style="width: 100%">
<el-option v-for="dict in dict.type.gk_appraising" :key="dict.value" :label="dict.label"
:value="dict.value">
</el-option>
......@@ -80,8 +81,13 @@
v-hasPermi="['system:achievement:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['system:achievement:remove']">删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
@click="handleDelete" v-hasPermi="['system:achievement:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-upload" size="mini" @click="handleImport"
v-hasPermi="['system:achievements:importData']">导入
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
......@@ -133,7 +139,8 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
<el-button size="mini" type="text" @click="handleUpdate(scope.row)"
v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
<el-button size="mini" type="text" @click="handleDelete(scope.row)"
v-hasPermi="['system:achievement:remove']"
......@@ -144,9 +151,38 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 导入 -->
<el-dialog :title="title" :visible.sync="uploadOpen" width="520px" append-to-body inline @close="cancel">
<el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="70px">
<el-form-item prop="dataUrl">
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
:on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false"
drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline"
@click="importTemplate">下载模板
</el-link>
</div>
</el-upload>
</el-form-item>
</el-form>
<div class="mask" v-if="importing">
<div class="mask-content">
<i class="el-icon-loading"></i>
<span>正在导入，请稍候...</span>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFileForm">确 定</el-button>
<el-button @click="cancelFile">取 消</el-button>
</div>
</el-dialog>
<!-- 添加或修改高考成绩对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="92px" class="add">
......@@ -154,8 +190,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -246,8 +282,8 @@
<el-col :span="12">
<el-form-item label="学科" prop="sub">
<el-select v-model="form.sub" placeholder="请选择" style="width: 100%;">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value" :label="dict.label"
:value="dict.value">
<el-option v-for="dict in dict.type.teaching_subjects" :key="dict.value"
:label="dict.label" :value="dict.value">
</el-option>
</el-select>
</el-form-item>
......@@ -336,6 +372,7 @@
<script>
import { listAchievement, getAchievement, delAchievement, addAchievement, updateAchievement, audit, listAchievementgr } from "@/api/smartSchool/electronicArchives/examinationScore";;
import SelectUser from "./components/SelectUser";
import { getToken } from '@/utils/auth'
export default {
name: "Achievement",
dicts: ["teaching_subjects", 'class_type', 'rankda', 'gk_appraising', 'class_num', 'audit_states'],
......@@ -344,6 +381,26 @@ export default {
},
data() {
return {
importing: false,
uploadOpen: false,
upload: {
// 是否显示弹出层（用户导入）
open: false,
// 弹出层标题（用户导入）
title: "",
// 是否禁用上传
isUploading: false,
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url:
process.env.VUE_APP_BASE_API + "/achievement/importData",
},
uploadForm: {
},
// 选择对应处理人
selectHandles: {
id: null,
......@@ -425,7 +482,43 @@ export default {
this.getList();
},
methods: {
//下载模版
importTemplate() {
this.download(
"/achievement/importTemplate",
{},
`高考成绩_${Date.now()}.xlsx`
);
},
/** 导入按钮操作 */
handleImport(row) {
this.reset();
this.title = "导入"
this.uploadOpen = true
},
handleFileUploadProgress(event, file, fileList) {
this.upload.isUploading = true;
this.importing = true;
// console.log(event, file, fileList);
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
this.uploadOpen = false
this.upload.isUploading = false
this.importing = false;
this.$refs.upload.clearFiles()
this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', { dangerouslyUseHTMLString: true })
this.getList()
},
// 提交上传文件
submitFileForm() {
this.$refs.upload.submit()
},
cancelFile() {
this.uploadOpen = false
this.upload.isUploading = false
this.$refs.upload.clearFiles()
},
/** 查询高考成绩列表 */
getList() {
this.loading = true;
......@@ -633,7 +726,27 @@ export default {
}
};
</script>
<style scoped lang="scss" >
<style scoped lang="scss">
.mask {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
}
.mask-content {
display: flex;
align-items: center;
justify-content: center;
color: #1a74be;
font-size: 15px;
}
::v-deep .el-form-item {
margin-bottom: 0px;
}
......
ruoyi-ui/src/views/smartSchool/logisticsManage/itemRegistration/components/OuterStorage/index.vue
......@@ -25,17 +25,17 @@
</el-form>
<el-table v-loading="loading" :data="assetsList" @selection-change="handleSelectionChange">
<el-table-column type="index" width="55" align="center" label="序号"/>
<el-table-column label="资产名称" align="center" prop="assetsName"/>
<el-table-column label="出库时间" align="center" prop="outDate"/>
<el-table-column label="出库数量" align="center" prop="outNumbers"/>
<el-table-column type="index" width="55" align="center" label="序号" />
<el-table-column label="资产名称" align="center" prop="assetsName" />
<el-table-column label="出库时间" align="center" prop="outDate" />
<el-table-column label="出库数量" align="center" prop="outNumbers" />
<el-table-column label="出库类型" align="center" prop="outType">
<template slot-scope="scope">
<dict-tag :options="dict.type.out_type" :value="scope.row.outType"/>
<dict-tag :options="dict.type.out_type" :value="scope.row.outType" />
</template>
</el-table-column>
<el-table-column label="领用人" align="center" prop="outByName"/>
<el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="领用人" align="center" prop="outByName" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="350px">
<template slot-scope="scope">
......@@ -49,16 +49,16 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"/>
@pagination="getList" />
<!-- 添加物品出库对话框 -->
<el-dialog :title="title" :visible.sync="open" width="650px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true" :disabled="true">
<el-form-item label="资产名称" prop="assetsName">
<el-input v-model="this.$route.query.assetsName" placeholder="请输入资产名称"/>
<el-input v-model="this.$route.query.assetsName" placeholder="请输入资产名称" />
</el-form-item>
<el-form-item label="规格型号" prop="assetsSpecs">
<el-input v-model="this.$route.query.assetsSpecs" placeholder="请输入规格型号"/>
<el-input v-model="this.$route.query.assetsSpecs" placeholder="请输入规格型号" />
</el-form-item>
<el-form-item label="资产属性" prop="assetsAttribute">
<el-select v-model="this.$route.query.assetsAttribute" style="width:206px">
......@@ -67,17 +67,16 @@
</el-select>
</el-form-item>
<el-form-item label="库存数量" prop="assetsNumbers">
<el-input v-model="this.$route.query.assetsNumbers" placeholder="请输入库存数量"/>
<el-input v-model="this.$route.query.assetsNumbers" placeholder="请输入库存数量" />
</el-form-item>
</el-form>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
<el-form-item label="出库数量" prop="outNumbers">
<el-input v-model="form.outNumbers" placeholder=""/>
<el-input v-model="form.outNumbers" placeholder="" />
</el-form-item>
<el-form-item label="出库时间" prop="outDate">
<el-date-picker v-model="form.outDate" type="datetime" placeholder="选择日期时间"
value-format="yyyy-MM-dd HH:mm"
<el-date-picker v-model="form.outDate" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm"
format="yyyy-MM-dd HH:mm" style="width: 206px;">
</el-date-picker>
</el-form-item>
......@@ -88,10 +87,10 @@
</el-select>
</el-form-item>
<el-form-item label="领用人" prop="outByName">
<el-input v-model="form.outByName" @click.native="selectBoss1"/>
<el-input v-model="form.outByName" @click.native="selectBoss1" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input style="width:500px" v-model="form.remark" type="textarea" placeholder="请输入内容"/>
<el-input style="width:500px" v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -103,10 +102,10 @@
<el-dialog :title="title" :visible.sync="editOpen" width="650px">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true" :disabled="true">
<el-form-item label="资产名称" prop="assetsName">
<el-input v-model="this.$route.query.assetsName" placeholder="请输入资产名称"/>
<el-input v-model="this.$route.query.assetsName" placeholder="请输入资产名称" />
</el-form-item>
<el-form-item label="规格型号" prop="assetsSpecs">
<el-input v-model="this.$route.query.assetsSpecs" placeholder="请输入规格型号"/>
<el-input v-model="this.$route.query.assetsSpecs" placeholder="请输入规格型号" />
</el-form-item>
<el-form-item label="资产属性" prop="assetsAttribute">
<el-select v-model="this.$route.query.assetsAttribute" style="width:206px">
......@@ -116,17 +115,16 @@
</el-form-item>
<el-form-item label="库存数量" prop="assetsNumbers">
<el-input v-model="this.$route.query.assetsNumbers" placeholder="请输入库存数量"/>
<el-input v-model="this.$route.query.assetsNumbers" placeholder="请输入库存数量" />
</el-form-item>
</el-form>
<el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
<el-form-item label="出库数量" prop="outNumbers">
<el-input v-model="form.outNumbers" placeholder=""/>
<el-input v-model="form.outNumbers" placeholder="" />
</el-form-item>
<el-form-item label="出库时间" prop="outDate">
<el-date-picker v-model="form.outDate" type="datetime" placeholder="选择日期时间"
value-format="yyyy-MM-dd HH:mm"
<el-date-picker v-model="form.outDate" type="datetime" placeholder="选择日期时间" value-format="yyyy-MM-dd HH:mm"
format="yyyy-MM-dd HH:mm" style="width: 206px;">
</el-date-picker>
</el-form-item>
......@@ -137,10 +135,10 @@
</el-select>
</el-form-item>
<el-form-item label="领用人" prop="outByName">
<el-input v-model="form.outByName" @click.native="selectBoss1"/>
<el-input v-model="form.outByName" @click.native="selectBoss1" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input style="width:500px" v-model="form.remark" type="textarea" placeholder="请输入内容"/>
<el-input style="width:500px" v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
......@@ -157,8 +155,8 @@
<el-table style="width:560px;margin:0 25px 0 25px" ref="multipleTable" max-height="250" v-loading="loading"
:data="outByList" size="small" highlight-current-row @row-click="handleCurrentChange"
@selection-change="select" @select-all="selectAll">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="用户名" align="center" prop="teacherName"/>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="用户名" align="center" prop="teacherName" />
<el-table-column prop="deptName" label="部门" align="center">
</el-table-column>
</el-table>
......@@ -196,7 +194,7 @@ import Treeselect from "@riophae/vue-treeselect";
export default {
dicts: ["asset_attributes", "out_type"],
name: "OuterStorage",
components: {TeacherSelectLite},
components: { TeacherSelectLite },
data() {
return {
......@@ -243,16 +241,16 @@ export default {
// 表单校验
rules: {
outDate: [
{required: true, message: "时间不能为空", trigger: "blur"}
{ required: true, message: "时间不能为空", trigger: "blur" }
],
outNumbers: [
{required: true, message: "数量不能为空", trigger: "blur"}
{ required: true, message: "数量不能为空", trigger: "blur" }
],
outType: [
{required: true, message: "出库类型不能为空", trigger: "blur"}
{ required: true, message: "出库类型不能为空", trigger: "blur" }
],
outByName: [
{required: true, message: "领用人不能为空", trigger: "change"}
{ required: true, message: "领用人不能为空", trigger: "change" }
],
}
};
......@@ -446,6 +444,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
......@@ -21,19 +21,19 @@
<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="50" align="center" />
<el-table-column label="自编码" align="center" prop="encode" width="180" />
<el-table-column label="设备名称" align="center" prop="equipmentName" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="领用日期" align="center" prop="recipientTime" width="200" />
<el-table-column label="领用人" align="center" prop="recipientBy" />
<el-table-column label="退还日期" align="center" prop="returnTime" width="200" />
<el-table-column label="自编码" align="center" prop="encode" width="180" show-overflow-tooltip />
<el-table-column label="设备名称" align="center" prop="equipmentName" show-overflow-tooltip />
<el-table-column label="型号" align="center" prop="model" show-overflow-tooltip />
<el-table-column label="领用日期" align="center" prop="recipientTime" width="200" show-overflow-tooltip />
<el-table-column label="领用人" align="center" prop="recipientBy" show-overflow-tooltip />
<el-table-column label="退还日期" align="center" prop="returnTime" width="200" show-overflow-tooltip />
<el-table-column label="退还时设备情况" align="center" prop="returnEquipmentCondition">
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.returnEquipmentCondition) }}</div>
</template>
</el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="接收人" align="center" prop="receivedBy" show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
<template slot-scope="{ row }">
<div>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
......@@ -58,13 +58,15 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" type="index" label="序号" width="55" fixed="left" />
<el-table-column align="center" prop="encode" label="自编码" width="140" fixed="left"></el-table-column>
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left"></el-table-column>
<el-table-column align="center" prop="model" label="型号" fixed="left"></el-table-column>
<el-table-column align="center" prop="specification" label="出厂编号" fixed="left"></el-table-column>
<el-table-column align="center" prop="classificationCode" label="分类编码"></el-table-column>
<el-table-column align="center" prop="unit" label="设备编码"></el-table-column>
<el-table-column align="center" prop="ph" label="批号"></el-table-column>
<el-table-column align="center" prop="affiliationType" label="归属类型">
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="model" label="型号" fixed="left" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="specification" label="出厂编号" fixed="left"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="classificationCode" label="分类编码" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="unit" label="设备编码" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="ph" label="批号" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="affiliationType" label="归属类型" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
</template>
......@@ -86,10 +88,15 @@
</el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="120"></el-table-column>
<el-table-column align="center" prop="price" label="价格（元）" width="100"></el-table-column>
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="120"></el-table-column>
<el-table-column align="center" prop="place" label="地点"></el-table-column>
<el-table-column align="center" prop="useName" label="使用人"></el-table-column>
<el-table-column align="center" prop="remark" label="备注"></el-table-column>
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="120"
show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="place" label="地点" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="useName" label="使用人" show-overflow-tooltip></el-table-column>
<!-- 新加字段 -->
<el-table-column align="center" prop="bh" label="编号" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="bmmc" label="部门" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="zrr" label="责任人" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="remark" label="备注" show-overflow-tooltip></el-table-column>
<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="showDetail(1, scope.row.id)">编辑</el-button>
......@@ -102,8 +109,8 @@
@pagination="getList" />
<!-- 添加或修改对话框 -->
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="70%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20">
<el-col :span="24">
<el-form-item v-if="nowOptionType != 0" label="自编码:" prop="encode">
......@@ -245,6 +252,33 @@
clearable></el-input>
</el-form-item>
</el-col>
<!-- 2024-7-11==================== -->
<!-- 新加字段 -->
<el-col :span="12">
<el-form-item label="编号:" prop="bh">
<el-input v-model="form.bh" placeholder="请输入编号" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- 新增字段 -->
<el-col :span="12">
<el-form-item label="部门:" prop="bmmc">
<el-input v-model="form.bmmc" placeholder="请输入部门" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
<!-- 新加字段 -->
<el-col :span="12">
<el-form-item label="责任人:" prop="zrr">
<el-input v-model="form.zrr" placeholder="请输入责任人" :disabled="nowOptionType == 2 ? true : false"
clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- ====== -->
<el-col :span="12">
<el-form-item label="备注:" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注"
......@@ -281,7 +315,7 @@
</el-dialog>
<!-- 打印二维码 弹框部分 -->
<el-dialog title="打印条码预览" :visible.sync="printDialog" width="30%">
<!-- <el-dialog title="打印条码预览" :visible.sync="printDialog" width="30%">
<div class="qrCodeList">
<div v-for="(item, index) in chooseList" :key="index">
<div class="titlShow">东营市二中</div>
......@@ -300,11 +334,11 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="printCode">打 印</el-button>
</div>
</el-dialog>
</el-dialog> -->
<!-- 打印二维码 弹框部分 -->
<!-- 隐藏二维码页面样式 -->
<div id="printBlock">
<!-- <div id="printBlock">
<div v-for="(item, index) in printList" :key="index" class="printBody">
<div class="titlePrint">东营市二中</div>
<div class="flexBlock printQrCode">
......@@ -319,7 +353,7 @@
</div>
<div style="page-break-after:always"></div>
</div>
</div>
</div> -->
<!-- 隐藏二维码页面样式 -->
......@@ -337,7 +371,7 @@ import {
import { getProduct } from "../../../../api/smartSchool/schoolProperty/classiFication";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import QRCode from "qrcodejs2"; // 生成二维码插件
import ç from "qrcodejs2"; // 生成二维码插件
import printJS from "print-js"; // 打印插件
import * as dd from 'dingtalk-jsapi';
......@@ -396,6 +430,9 @@ export default {
ph: '',
affiliationType: '', // 其他属性
isAllowLend: '', // 其他属性
bh: '',
bmmc: '',
zrr: '',
},
isAllowLendDisabled: false, // 默认禁用状态为false
rules: { // 表单校验
......@@ -518,6 +555,9 @@ export default {
useId: '',
remark: '',
ph: '',
bh: '',
bmmc: '',
zrr: '',
}
this.nowOptionType = type
this.getSelectUser()
......@@ -568,6 +608,9 @@ export default {
ph: this.form.ph,
useId,
remark: this.form.remark,
bh: this.form.bh,
bmmc: this.form.bmmc,
zrr: this.form.zrr,
}
addEquipmentLedger(data).then(res => {
if (res.code == 200) {
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
......@@ -4,19 +4,24 @@
<el-dialog title="打印条码预览" :visible.sync="printDialog" width="45%">
<div class="qrCodeList">
<div v-for="(item, index) in chooseList" :key="index">
<div class="titlShow">东营市二中</div>
<div class="flexBlock qrCode">
<div class="qrCodeLeft">
<div class="titlShow">东营市二中</div>
<div :id="'qrcode' + index"></div>
<!-- <div>{{ item.encode }}</div> -->
<!-- <div>{{ item.unit }}</div> -->
</div>
<div class="qrCodeRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div>
<div>设备编码：{{ item.unit }}</div>
<div>非涉密{{ item.equipmentName }}：{{ item.model }}</div>
<!--新加字段 2024-7-11 -->
<div v-if="item.bh !== undefined && item.bh !== ''">编号:{{ item.bh }}</div>
<div v-if="item.bmmc !== undefined && item.bmmc !== ''">部门:{{ item.bmmc }}</div>
<div v-if="item.zrr !== undefined && item.zrr !== ''">责任人:{{ item.zrr }}</div>
<!-- 停用字段 -->
<!-- <div v-if="item.place !== undefined && item.place !== ''">地点：{{ item.place }}</div> -->
<!-- <div v-if="item.unit !== undefined && item.unit !== ''">设备编码：{{ item.unit }}</div> -->
<div v-if="item.remark !== undefined && item.remark !== ''">备注：{{ item.remark }}</div>
</div>
</div>
</div>
</div>
......@@ -29,18 +34,23 @@
<!-- 隐藏二维码页面样式 -->
<div id="printBlock">
<div v-for="(item, index) in printList" :key="index" class="printBody">
<div class="titlePrint">东营市二中</div>
<div class="flexBlock printQrCode">
<div class="printLeft">
<div class="titlePrint">东营市二中</div>
<div :id="'print' + index" class="printImg"></div>
<!-- <div>{{ item.unit }}</div> -->
</div>
<div class="printRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div>
<div>设备编码：{{ item.unit }}</div>
<div>非涉密{{ item.equipmentName }}：{{ item.model }}</div>
<!--新加字段 2024-7-11 -->
<div v-if="item.bh !== undefined && item.bh !== ''">编号:{{ item.bh }}</div>
<div v-if="item.bmmc !== undefined && item.bmmc !== ''">部门:{{ item.bmmc }}</div>
<div v-if="item.zrr !== undefined && item.zrr !== ''">责任人:{{ item.zrr }}</div>
<!-- 停用字段 -->
<!-- <div v-if="item.place !== undefined && item.place !== ''">地点：{{ item.place }}</div> -->
<!-- <div v-if="item.unit !== undefined && item.unit !== ''">设备编码：{{ item.unit }}</div> -->
<div v-if="item.remark !== undefined && item.remark !== ''">备注：{{ item.remark }}</div>
</div>
</div>
<div style="page-break-after:always"></div>
</div>
......@@ -111,32 +121,32 @@ export default {
printBarcodes() {
this.printDialog = true;
this.$nextTick(() => {
this.printList.map((item, index) => {
console.log(item, 'item');
const domPrint = document.getElementById(`print${index}`).lastElementChild;
if (domPrint == null) {
new QRCode(`print${index}`, {
this.printList.forEach((item, index) => {
const domPrint = document.getElementById(`print${index}`);
if (domPrint && !domPrint.lastElementChild) {
new QRCode(domPrint, {
width: 60,
height: 60,
// text: item.unit,
text: item.encode,
});
}
});
this.chooseList.map((item, index) => {
console.log(item, 'item');
const dom = document.getElementById(`qrcode${index}`).lastElementChild;
if (dom == null) {
new QRCode(`qrcode${index}`, {
this.chooseList.forEach((item, index) => {
const dom = document.getElementById(`qrcode${index}`);
if (dom && !dom.lastElementChild) {
new QRCode(dom, {
width: 250,
height: 250,
// text: item.unit,
text: item.encode,
});
}
});
});
},
//打印条码
printCode() {
printJS({
......@@ -201,7 +211,8 @@ export default {
}
.qrCodeRight {
padding: 20px 0 20px 15px;
width: 500px;
padding: 10px 0px 10px 10px;
}
.titlShow {
......@@ -209,11 +220,14 @@ export default {
text-align: center;
padding-bottom: 10px;
font-size: 16px;
/* width: 75%; */
}
#printBlock {
display: none;
margin: 0px !important;
margin: 0 auto 20px auto;
/* padding: 0; */
/* 去除内边距 */
}
.printLeft {
......@@ -232,10 +246,11 @@ export default {
line-height: 20px;
align-items: center;
padding: 8px;
margin-top: -10px;
}
.printRight {
width: 60%;
width: 70%;
padding: 0 5px;
}
......@@ -243,9 +258,16 @@ export default {
font-size: 8px;
font-weight: bold;
text-align: center;
/* width: 85%; */
}
.printImg {
display: block;
}
::v-deep .el-dialog__body {
font-size: 16px;
padding: 5px 5px !important;
}
</style>
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
......@@ -5,7 +5,8 @@
<el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable />
</el-form-item>
<el-form-item label="借用日期" prop="studentName">
<el-date-picker v-model="queryParams.borrowTime" type="date" clearable placeholder="请选择借用日期" format="yyyy-MM-dd">
<el-date-picker v-model="queryParams.borrowTime" type="date" clearable placeholder="请选择借用日期"
format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
......@@ -20,22 +21,22 @@
</el-row>
<el-table v-loading="loading" :data="lendReturnData" stripe>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="自编码" align="center" prop="encode" width="140" />
<el-table-column label="设备名称" align="center" prop="equipmentName" width="130" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="借用日期" align="center" prop="borrowTime" width="160" />
<el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" />
<el-table-column label="预计使用期限" align="center" prop="yjuseTime" width="160" />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160">
<el-table-column label="自编码" align="center" prop="encode" width="140" show-overflow-tooltip />
<el-table-column label="设备名称" align="center" prop="equipmentName" width="130" show-overflow-tooltip />
<el-table-column label="型号" align="center" prop="model" show-overflow-tooltip />
<el-table-column label="借用日期" align="center" prop="borrowTime" width="160" show-overflow-tooltip />
<el-table-column label="借用人" align="center" prop="borrowBy" show-overflow-tooltip />
<el-table-column label="用途" align="center" prop="purpose" show-overflow-tooltip />
<el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" show-overflow-tooltip />
<el-table-column label="预计使用期限" align="center" prop="yjuseTime" width="160" show-overflow-tooltip />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160" show-overflow-tooltip>
<template slot-scope="{ row }">
<dict-tag :options="dict.type.equipment_state" :value="row.returnEquipmentCondition" />
</template>
</el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" />
<el-table-column label="实际使用时间" align="center" prop="sjuseTime" width="160" />
<el-table-column label="接收人" align="center" prop="receivedBy" show-overflow-tooltip />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" show-overflow-tooltip />
<el-table-column label="实际使用时间" align="center" prop="sjuseTime" width="160" show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
<template slot-scope="{ row }">
......@@ -129,7 +130,8 @@
<el-form-item label="接收人" prop="receivedById">
<el-select v-model="lendReturnForm.receivedById" filterable placeholder="请选择接收人"
:disabled="nowType == 2 ? true : false" clearable style="width: 100%;">
<el-option v-for="(item, index) in adminUserList" :key="index" :label="item.admin" :value="item.adminId">
<el-option v-for="(item, index) in adminUserList" :key="index" :label="item.admin"
:value="item.adminId">
</el-option>
</el-select>
</el-form-item>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/outboundLedger/index.vue
......@@ -28,28 +28,29 @@
<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" fixed="left" />
<el-table-column label="出库类型" align="center" prop="outStockType" fixed="left" width="200" />
<el-table-column label="设备名称" align="center" prop="equipmentName" fixed="left" />
<el-table-column label="型号" align="center" prop="model" fixed="left" />
<el-table-column label="出库类型" align="center" prop="outStockType" fixed="left" width="200" show-overflow-tooltip />
<el-table-column label="设备名称" align="center" prop="equipmentName" fixed="left" width="200"
show-overflow-tooltip />
<el-table-column label="型号" align="center" prop="model" fixed="left" show-overflow-tooltip />
<!-- <el-table-column label="规格" align="center" prop="specification" fixed="left" /> -->
<el-table-column label="分类编码" align="center" prop="classificationCode" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column align="center" prop="affiliationType" label="归属类型">
<el-table-column label="分类编码" align="center" prop="classificationCode" show-overflow-tooltip />
<el-table-column label="单位" align="center" prop="unit" show-overflow-tooltip />
<el-table-column align="center" prop="affiliationType" label="归属类型" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="equipmentState" label="设备状态">
<el-table-column align="center" prop="equipmentState" label="设备状态" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
</template>
</el-table-column>
<el-table-column label="安装时间" align="center" prop="dateOfProduction" width="200" />
<el-table-column label="价格（元）" align="center" prop="price" width="180" />
<el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" width="120px" />
<el-table-column label="地点" align="center" prop="place" />
<el-table-column label="使用人" align="center" prop="useName" />
<el-table-column label="备注" align="center" prop="remark" width="200" />
<el-table-column label="安装时间" align="center" prop="dateOfProduction" width="200" show-overflow-tooltip />
<el-table-column label="价格（元）" align="center" prop="price" width="180" show-overflow-tooltip />
<el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" width="120px" show-overflow-tooltip />
<el-table-column label="地点" align="center" prop="place" show-overflow-tooltip />
<el-table-column label="使用人" align="center" prop="useName" show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" width="200" show-overflow-tooltip />
<el-table-column label="操作" align="center" prop="orgname" width="200" fixed="right">
<template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleLook(row)">查看</el-button>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="108px">
<el-form-item label="设备名称" prop="equipmentName">
<el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable></el-input>
</el-form-item>
......@@ -32,21 +33,22 @@
<!-- 表格数据 -->
<el-table :data="applyTable" style="width: 100%">
<el-table-column align="center" type="index" label="序号" fixed="left" />
<el-table-column align="center" prop="encode" label="自编码" width="150px" fixed="left" />
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left" />
<el-table-column align="center" prop="model" label="型号" fixed="left" />
<el-table-column align="center" prop="classificationCode" label="分类编码" fixed="left" />
<el-table-column align="center" prop="dateOfProduction" label="安装时间" />
<el-table-column align="center" prop="place" label="地点" />
<el-table-column align="center" prop="problem" label="问题" />
<el-table-column align="center" prop="repairName" label="修理人" />
<el-table-column align="center" prop="repairTime" label="修理时间" width="160px" />
<el-table-column align="center" prop="repairState" label="修理结果">
<el-table-column align="center" prop="encode" label="自编码" width="150px" fixed="left"
show-overflow-tooltip />
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="model" label="型号" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="classificationCode" label="分类编码" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="dateOfProduction" label="安装时间" show-overflow-tooltip />
<el-table-column align="center" prop="place" label="地点" show-overflow-tooltip />
<el-table-column align="center" prop="problem" label="问题" show-overflow-tooltip />
<el-table-column align="center" prop="repairName" label="修理人" show-overflow-tooltip />
<el-table-column align="center" prop="repairTime" label="修理时间" width="160px" show-overflow-tooltip />
<el-table-column align="center" prop="repairState" label="修理结果" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.repair_state, row.repairState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="disposeState" label="处理状态">
<el-table-column align="center" prop="disposeState" label="处理状态" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.dispose_state, row.disposeState) }}</div>
</template>
......@@ -72,8 +74,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="自编码" prop="encode">
<el-input v-model="postForm.encode" placeholder="自编码" :disabled="nowType != 0 ? true : false"
@change="getRencode"></el-input>
<el-input v-model="postForm.encode" placeholder="自编码"
:disabled="nowType != 0 ? true : false" @change="getRencode"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -138,23 +140,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="地点" prop="place">
<el-input v-model="postForm.place" placeholder="地点" :disabled="nowType == 2 ? true : false" />
<el-input v-model="postForm.place" placeholder="地点"
:disabled="nowType == 2 ? true : false" />
</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%;"
:disabled="nowType == 2 ? true : false">
<el-option v-for="(item, index) in dict.type.dispose_state" :key="index" :label="item.label"
:value="item.value"></el-option>
<el-option v-for="(item, index) in dict.type.dispose_state" :key="index"
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<!-- 根据处理状态为1显示repairState下拉框 -->
<el-form-item v-if="postForm.disposeState === '1'" label="维修状态" prop="repairState">
<el-select v-model="postForm.repairState" 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-option v-for="(item, index) in dict.type.repair_state" :key="index"
:label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
......@@ -170,7 +173,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="评价" prop="evaluate">
<el-rate v-model="postForm.evaluate" :max="5" :disabled="nowType == 2 ? true : false"></el-rate>
<el-rate v-model="postForm.evaluate" :max="5"
:disabled="nowType == 2 ? true : false"></el-rate>
</el-form-item>
</el-col>
</el-row>
......@@ -191,8 +195,8 @@
</el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList"></pagination>
</div>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/warehousingLedger/index.vue
......@@ -26,41 +26,42 @@
<el-table stripe :data="warehousingLedger" width="100%">
<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 align="center" prop="inStockType" label="入库类型" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="inStockTime" label="入库时间" width="200" fixed="left"
show-overflow-tooltip />
<el-table-column align="center" prop="encode" label="自编码" width="200" fixed="left" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left">
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="model" label="型号" fixed="left">
<el-table-column align="center" prop="model" label="型号" fixed="left" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="classificationCode" label="分类编码">
<el-table-column align="center" prop="classificationCode" label="分类编码" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="unit" label="单位">
</el-table-column>
<el-table-column align="center" prop="affiliationType" label="归属类型">
<el-table-column align="center" prop="affiliationType" label="归属类型" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="equipmentState" label="设备状态">
<el-table-column align="center" prop="equipmentState" label="设备状态" show-overflow-tooltip>
<template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
</template>
</el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="130">
</el-table-column>
<el-table-column align="center" prop="price" label="价格（元）" width="100">
<el-table-column align="center" prop="price" label="价格（元）" width="100" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="130">
<el-table-column align="center" prop="lifeOfUtility" label="效用年限（年）" width="130" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="place" label="地点">
<el-table-column align="center" prop="place" label="地点" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="useName" label="使用人">
<el-table-column align="center" prop="useName" label="使用人" show-overflow-tooltip>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注" width="200">
<el-table-column align="center" prop="remark" label="备注" width="200" show-overflow-tooltip>
</el-table-column>
<el-table-column label="操作" width="180" align="center" fixed="right">
<template slot-scope="scope">
......@@ -70,8 +71,8 @@
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 查看对话框 -->
<el-dialog :title="title" :visible.sync="dialogVisible" width="60%" append-to-body>
......
ruoyi-ui/src/views/whitePage.vue
......@@ -30,7 +30,7 @@ export default {
getCode() {
dd.getAuthCode({
//测试
//corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
// corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//正式
corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => {
......
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