Skip to content

D
dd_school
Commit 7ad8e234 by wangjian
Options

Merge remote-tracking branch 'origin/master'

parents bb09efff 86c2163f
Showing with 221 additions and 119 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 @@ ...@@ -25,7 +25,7 @@
</div> </div>
<div class="login-card-right"> <div class="login-card-right">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<!-- <h3 class="title">智慧校园管理系统</h3>--> <!-- <h3 class="title">智慧校园管理系统</h3>-->
<h3 class="title">智慧校园管理系统</h3> <h3 class="title">智慧校园管理系统</h3>
<el-form-item prop="phonenumber"> <el-form-item prop="phonenumber">
<el-input v-model="loginForm.phonenumber" type="text" auto-complete="off" placeholder="手机号码"> <el-input v-model="loginForm.phonenumber" type="text" auto-complete="off" placeholder="手机号码">
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
</div> </div>
<!-- 底部 --> <!-- 底部 -->
<div class="el-login-footer"> <div class="el-login-footer">
<!-- <span>© 2021 zhimin Copyright </span>--> <!-- <span>© 2021 zhimin Copyright </span>-->
</div> </div>
</div> </div>
</template> </template>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/collectionLedger/index.vue
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
<el-table v-loading="loading" :data="collectionData" stripe> <el-table v-loading="loading" :data="collectionData" stripe>
<el-table-column type="selection" width="55"></el-table-column> <el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="50" align="center" /> <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="encode" width="180" show-overflow-tooltip />
<el-table-column label="设备名称" align="center" prop="equipmentName" /> <el-table-column label="设备名称" align="center" prop="equipmentName" show-overflow-tooltip />
<el-table-column label="型号" align="center" prop="model" /> <el-table-column label="型号" align="center" prop="model" show-overflow-tooltip />
<el-table-column label="领用日期" align="center" prop="recipientTime" width="200" /> <el-table-column label="领用日期" align="center" prop="recipientTime" width="200" show-overflow-tooltip />
<el-table-column label="领用人" align="center" prop="recipientBy" /> <el-table-column label="领用人" align="center" prop="recipientBy" show-overflow-tooltip />
<el-table-column label="退还日期" align="center" prop="returnTime" width="200" /> <el-table-column label="退还日期" align="center" prop="returnTime" width="200" show-overflow-tooltip />
<el-table-column label="退还时设备情况" align="center" prop="returnEquipmentCondition"> <el-table-column label="退还时设备情况" align="center" prop="returnEquipmentCondition">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.returnEquipmentCondition) }}</div> <div>{{ selectDictLabel(dict.type.equipment_state, row.returnEquipmentCondition) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" /> <el-table-column label="接收人" align="center" prop="receivedBy" show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right"> <el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div> <div>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -58,13 +58,15 @@ ...@@ -58,13 +58,15 @@
<el-table-column type="selection" width="55" align="center" /> <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" 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="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="equipmentName" label="设备名称" fixed="left"
<el-table-column align="center" prop="model" label="型号" fixed="left"></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="specification" label="出厂编号" fixed="left"></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="classificationCode" label="分类编码"></el-table-column> <el-table-column align="center" prop="specification" label="出厂编号" fixed="left"
<el-table-column align="center" prop="unit" label="设备编码"></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="ph" label="批号"></el-table-column> <el-table-column align="center" prop="classificationCode" label="分类编码" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="affiliationType" label="归属类型"> <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 }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div> <div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
</template> </template>
...@@ -86,10 +88,15 @@ ...@@ -86,10 +88,15 @@
</el-table-column> </el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="120"></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="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="lifeOfUtility" label="效用年限（年）" width="120"
<el-table-column align="center" prop="place" label="地点"></el-table-column> show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="useName" label="使用人"></el-table-column> <el-table-column align="center" prop="place" label="地点" show-overflow-tooltip></el-table-column>
<el-table-column align="center" prop="remark" label="备注"></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"> <el-table-column label="操作" align="center" min-width="220px" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="showDetail(1, scope.row.id)">编辑</el-button> <el-button size="mini" type="text" icon="el-icon-edit" @click="showDetail(1, scope.row.id)">编辑</el-button>
...@@ -102,8 +109,8 @@ ...@@ -102,8 +109,8 @@
@pagination="getList" /> @pagination="getList" />
<!-- 添加或修改对话框 --> <!-- 添加或修改对话框 -->
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%" append-to-body> <el-dialog title="详细信息" :visible.sync="dialogVisible" width="70%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="nowOptionType != 0" label="自编码:" prop="encode"> <el-form-item v-if="nowOptionType != 0" label="自编码:" prop="encode">
...@@ -245,6 +252,33 @@ ...@@ -245,6 +252,33 @@
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-col> </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-col :span="12">
<el-form-item label="备注:" prop="remark"> <el-form-item label="备注:" prop="remark">
<el-input type="textarea" v-model="form.remark" placeholder="请输入备注" <el-input type="textarea" v-model="form.remark" placeholder="请输入备注"
...@@ -281,7 +315,7 @@ ...@@ -281,7 +315,7 @@
</el-dialog> </el-dialog>
<!-- 打印二维码 弹框部分 --> <!-- 打印二维码 弹框部分 -->
<el-dialog title="打印条码预览" :visible.sync="printDialog" width="30%"> <!-- <el-dialog title="打印条码预览" :visible.sync="printDialog" width="30%">
<div class="qrCodeList"> <div class="qrCodeList">
<div v-for="(item, index) in chooseList" :key="index"> <div v-for="(item, index) in chooseList" :key="index">
<div class="titlShow">东营市二中</div> <div class="titlShow">东营市二中</div>
...@@ -300,11 +334,11 @@ ...@@ -300,11 +334,11 @@
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="printCode">打 印</el-button> <el-button type="primary" @click="printCode">打 印</el-button>
</div> </div>
</el-dialog> </el-dialog> -->
<!-- 打印二维码 弹框部分 --> <!-- 打印二维码 弹框部分 -->
<!-- 隐藏二维码页面样式 --> <!-- 隐藏二维码页面样式 -->
<div id="printBlock"> <!-- <div id="printBlock">
<div v-for="(item, index) in printList" :key="index" class="printBody"> <div v-for="(item, index) in printList" :key="index" class="printBody">
<div class="titlePrint">东营市二中</div> <div class="titlePrint">东营市二中</div>
<div class="flexBlock printQrCode"> <div class="flexBlock printQrCode">
...@@ -319,7 +353,7 @@ ...@@ -319,7 +353,7 @@
</div> </div>
<div style="page-break-after:always"></div> <div style="page-break-after:always"></div>
</div> </div>
</div> </div> -->
<!-- 隐藏二维码页面样式 --> <!-- 隐藏二维码页面样式 -->
...@@ -337,7 +371,7 @@ import { ...@@ -337,7 +371,7 @@ import {
import { getProduct } from "../../../../api/smartSchool/schoolProperty/classiFication"; import { getProduct } from "../../../../api/smartSchool/schoolProperty/classiFication";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import QRCode from "qrcodejs2"; // 生成二维码插件 import ç from "qrcodejs2"; // 生成二维码插件
import printJS from "print-js"; // 打印插件 import printJS from "print-js"; // 打印插件
import * as dd from 'dingtalk-jsapi'; import * as dd from 'dingtalk-jsapi';
...@@ -396,6 +430,9 @@ export default { ...@@ -396,6 +430,9 @@ export default {
ph: '', ph: '',
affiliationType: '', // 其他属性 affiliationType: '', // 其他属性
isAllowLend: '', // 其他属性 isAllowLend: '', // 其他属性
bh: '',
bmmc: '',
zrr: '',
}, },
isAllowLendDisabled: false, // 默认禁用状态为false isAllowLendDisabled: false, // 默认禁用状态为false
rules: { // 表单校验 rules: { // 表单校验
...@@ -518,6 +555,9 @@ export default { ...@@ -518,6 +555,9 @@ export default {
useId: '', useId: '',
remark: '', remark: '',
ph: '', ph: '',
bh: '',
bmmc: '',
zrr: '',
} }
this.nowOptionType = type this.nowOptionType = type
this.getSelectUser() this.getSelectUser()
...@@ -568,6 +608,9 @@ export default { ...@@ -568,6 +608,9 @@ export default {
ph: this.form.ph, ph: this.form.ph,
useId, useId,
remark: this.form.remark, remark: this.form.remark,
bh: this.form.bh,
bmmc: this.form.bmmc,
zrr: this.form.zrr,
} }
addEquipmentLedger(data).then(res => { addEquipmentLedger(data).then(res => {
if (res.code == 200) { if (res.code == 200) {
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
...@@ -4,19 +4,24 @@ ...@@ -4,19 +4,24 @@
<el-dialog title="打印条码预览" :visible.sync="printDialog" width="45%"> <el-dialog title="打印条码预览" :visible.sync="printDialog" width="45%">
<div class="qrCodeList"> <div class="qrCodeList">
<div v-for="(item, index) in chooseList" :key="index"> <div v-for="(item, index) in chooseList" :key="index">
<div class="titlShow">东营市二中</div>
<div class="flexBlock qrCode"> <div class="flexBlock qrCode">
<div class="qrCodeLeft"> <div class="qrCodeLeft">
<div class="titlShow">东营市二中</div>
<div :id="'qrcode' + index"></div> <div :id="'qrcode' + index"></div>
<!-- <div>{{ item.encode }}</div> --> <!-- <div>{{ item.encode }}</div> -->
<!-- <div>{{ item.unit }}</div> --> <!-- <div>{{ item.unit }}</div> -->
</div> </div>
<div class="qrCodeRight"> <div class="qrCodeRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div> <div>非涉密{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div> <!--新加字段 2024-7-11 -->
<div>设备编码：{{ item.unit }}</div> <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>
</div> </div>
</div> </div>
...@@ -29,18 +34,23 @@ ...@@ -29,18 +34,23 @@
<!-- 隐藏二维码页面样式 --> <!-- 隐藏二维码页面样式 -->
<div id="printBlock"> <div id="printBlock">
<div v-for="(item, index) in printList" :key="index" class="printBody"> <div v-for="(item, index) in printList" :key="index" class="printBody">
<div class="titlePrint">东营市二中</div>
<div class="flexBlock printQrCode"> <div class="flexBlock printQrCode">
<div class="printLeft"> <div class="printLeft">
<div class="titlePrint">东营市二中</div>
<div :id="'print' + index" class="printImg"></div> <div :id="'print' + index" class="printImg"></div>
<!-- <div>{{ item.unit }}</div> --> <!-- <div>{{ item.unit }}</div> -->
</div> </div>
<div class="printRight"> <div class="printRight">
<div>{{ item.equipmentName }}：{{ item.model }}</div> <div>非涉密{{ item.equipmentName }}：{{ item.model }}</div>
<div>地点：{{ item.place }}</div> <!--新加字段 2024-7-11 -->
<div>设备编码：{{ item.unit }}</div> <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>
<div style="page-break-after:always"></div> <div style="page-break-after:always"></div>
</div> </div>
...@@ -111,32 +121,32 @@ export default { ...@@ -111,32 +121,32 @@ export default {
printBarcodes() { printBarcodes() {
this.printDialog = true; this.printDialog = true;
this.$nextTick(() => { this.$nextTick(() => {
this.printList.map((item, index) => { this.printList.forEach((item, index) => {
console.log(item, 'item'); const domPrint = document.getElementById(`print${index}`);
const domPrint = document.getElementById(`print${index}`).lastElementChild; if (domPrint && !domPrint.lastElementChild) {
if (domPrint == null) { new QRCode(domPrint, {
new QRCode(`print${index}`, {
width: 60, width: 60,
height: 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; this.chooseList.forEach((item, index) => {
if (dom == null) { const dom = document.getElementById(`qrcode${index}`);
new QRCode(`qrcode${index}`, { if (dom && !dom.lastElementChild) {
new QRCode(dom, {
width: 250, width: 250,
height: 250, height: 250,
// text: item.unit, text: item.encode,
}); });
} }
}); });
}); });
}, },
//打印条码 //打印条码
printCode() { printCode() {
printJS({ printJS({
...@@ -201,7 +211,8 @@ export default { ...@@ -201,7 +211,8 @@ export default {
} }
.qrCodeRight { .qrCodeRight {
padding: 20px 0 20px 15px; width: 500px;
padding: 10px 0px 10px 10px;
} }
.titlShow { .titlShow {
...@@ -209,11 +220,14 @@ export default { ...@@ -209,11 +220,14 @@ export default {
text-align: center; text-align: center;
padding-bottom: 10px; padding-bottom: 10px;
font-size: 16px; font-size: 16px;
/* width: 75%; */
} }
#printBlock { #printBlock {
display: none; display: none;
margin: 0px !important; margin: 0 auto 20px auto;
/* padding: 0; */
/* 去除内边距 */
} }
.printLeft { .printLeft {
...@@ -232,10 +246,11 @@ export default { ...@@ -232,10 +246,11 @@ export default {
line-height: 20px; line-height: 20px;
align-items: center; align-items: center;
padding: 8px; padding: 8px;
margin-top: -10px;
} }
.printRight { .printRight {
width: 60%; width: 70%;
padding: 0 5px; padding: 0 5px;
} }
...@@ -243,9 +258,16 @@ export default { ...@@ -243,9 +258,16 @@ export default {
font-size: 8px; font-size: 8px;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
/* width: 85%; */
} }
.printImg { .printImg {
display: block; display: block;
} }
::v-deep .el-dialog__body {
font-size: 16px;
padding: 5px 5px !important;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
<el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable /> <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable />
</el-form-item> </el-form-item>
<el-form-item label="借用日期" prop="studentName"> <el-form-item label="借用日期" prop="studentName">
<el-date-picker v-model="queryParams.borrowTime" type="date" clearable placeholder="请选择借用日期" format="yyyy-MM-dd"> <el-date-picker v-model="queryParams.borrowTime" type="date" clearable placeholder="请选择借用日期"
format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -20,22 +21,22 @@ ...@@ -20,22 +21,22 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="lendReturnData" stripe> <el-table v-loading="loading" :data="lendReturnData" stripe>
<el-table-column label="序号" type="index" width="55" align="center" /> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="自编码" align="center" prop="encode" width="140" /> <el-table-column label="自编码" align="center" prop="encode" width="140" show-overflow-tooltip />
<el-table-column label="设备名称" align="center" prop="equipmentName" width="130" /> <el-table-column label="设备名称" align="center" prop="equipmentName" width="130" show-overflow-tooltip />
<el-table-column label="型号" align="center" prop="model" /> <el-table-column label="型号" align="center" prop="model" show-overflow-tooltip />
<el-table-column label="借用日期" align="center" prop="borrowTime" width="160" /> <el-table-column label="借用日期" align="center" prop="borrowTime" width="160" show-overflow-tooltip />
<el-table-column label="借用人" align="center" prop="borrowBy" /> <el-table-column label="借用人" align="center" prop="borrowBy" show-overflow-tooltip />
<el-table-column label="用途" align="center" prop="purpose" /> <el-table-column label="用途" align="center" prop="purpose" show-overflow-tooltip />
<el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" /> <el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" show-overflow-tooltip />
<el-table-column label="预计使用期限" align="center" prop="yjuseTime" width="160" /> <el-table-column label="预计使用期限" align="center" prop="yjuseTime" width="160" show-overflow-tooltip />
<el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160"> <el-table-column label="归还时设备情况" align="center" prop="returnEquipmentCondition" width="160" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<dict-tag :options="dict.type.equipment_state" :value="row.returnEquipmentCondition" /> <dict-tag :options="dict.type.equipment_state" :value="row.returnEquipmentCondition" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="接收人" align="center" prop="receivedBy" /> <el-table-column label="接收人" align="center" prop="receivedBy" show-overflow-tooltip />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" /> <el-table-column label="归还日期" align="center" prop="returnTime" width="160" show-overflow-tooltip />
<el-table-column label="实际使用时间" align="center" prop="sjuseTime" width="160" /> <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="remark" />
<el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right"> <el-table-column label="操作" align="center" prop="orgname" width="150" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
...@@ -129,7 +130,8 @@ ...@@ -129,7 +130,8 @@
<el-form-item label="接收人" prop="receivedById"> <el-form-item label="接收人" prop="receivedById">
<el-select v-model="lendReturnForm.receivedById" filterable placeholder="请选择接收人" <el-select v-model="lendReturnForm.receivedById" filterable placeholder="请选择接收人"
:disabled="nowType == 2 ? true : false" clearable style="width: 100%;"> :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-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/outboundLedger/index.vue
...@@ -28,28 +28,29 @@ ...@@ -28,28 +28,29 @@
<el-table v-loading="loading" :data="outBoundData" stripe> <el-table v-loading="loading" :data="outBoundData" stripe>
<el-table-column type="selection" width="55"></el-table-column> <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="序号" 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="outStockType" fixed="left" width="200" show-overflow-tooltip />
<el-table-column label="设备名称" align="center" prop="equipmentName" fixed="left" /> <el-table-column label="设备名称" align="center" prop="equipmentName" fixed="left" width="200"
<el-table-column label="型号" align="center" prop="model" fixed="left" /> 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="specification" fixed="left" /> -->
<el-table-column label="分类编码" align="center" prop="classificationCode" /> <el-table-column label="分类编码" align="center" prop="classificationCode" show-overflow-tooltip />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" show-overflow-tooltip />
<el-table-column align="center" prop="affiliationType" label="归属类型"> <el-table-column align="center" prop="affiliationType" label="归属类型" show-overflow-tooltip>
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div> <div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
</template> </template>
</el-table-column> </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 }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div> <div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="安装时间" align="center" prop="dateOfProduction" 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" /> <el-table-column label="价格（元）" align="center" prop="price" width="180" show-overflow-tooltip />
<el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" width="120px" /> <el-table-column label="效用年限（年）" align="center" prop="lifeOfUtility" width="120px" show-overflow-tooltip />
<el-table-column label="地点" align="center" prop="place" /> <el-table-column label="地点" align="center" prop="place" show-overflow-tooltip />
<el-table-column label="使用人" align="center" prop="useName" /> <el-table-column label="使用人" align="center" prop="useName" show-overflow-tooltip />
<el-table-column label="备注" align="center" prop="remark" width="200" /> <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"> <el-table-column label="操作" align="center" prop="orgname" width="200" fixed="right">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<el-button type="text" size="small" @click="handleLook(row)">查看</el-button> <el-button type="text" size="small" @click="handleLook(row)">查看</el-button>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
<template> <template>
<div class="app-container"> <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-form-item label="设备名称" prop="equipmentName">
<el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable></el-input> <el-input v-model="queryParams.equipmentName" placeholder="请输入设备名称" clearable></el-input>
</el-form-item> </el-form-item>
...@@ -32,21 +33,22 @@ ...@@ -32,21 +33,22 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table :data="applyTable" style="width: 100%"> <el-table :data="applyTable" style="width: 100%">
<el-table-column align="center" type="index" label="序号" fixed="left" /> <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="encode" label="自编码" width="150px" fixed="left"
<el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left" /> show-overflow-tooltip />
<el-table-column align="center" prop="model" label="型号" fixed="left" /> <el-table-column align="center" prop="equipmentName" label="设备名称" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="classificationCode" label="分类编码" fixed="left" /> <el-table-column align="center" prop="model" label="型号" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="dateOfProduction" label="安装时间" /> <el-table-column align="center" prop="classificationCode" label="分类编码" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="place" label="地点" /> <el-table-column align="center" prop="dateOfProduction" label="安装时间" show-overflow-tooltip />
<el-table-column align="center" prop="problem" label="问题" /> <el-table-column align="center" prop="place" label="地点" show-overflow-tooltip />
<el-table-column align="center" prop="repairName" label="修理人" /> <el-table-column align="center" prop="problem" label="问题" show-overflow-tooltip />
<el-table-column align="center" prop="repairTime" label="修理时间" width="160px" /> <el-table-column align="center" prop="repairName" label="修理人" show-overflow-tooltip />
<el-table-column align="center" prop="repairState" label="修理结果"> <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 }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.repair_state, row.repairState) }}</div> <div>{{ selectDictLabel(dict.type.repair_state, row.repairState) }}</div>
</template> </template>
</el-table-column> </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 }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.dispose_state, row.disposeState) }}</div> <div>{{ selectDictLabel(dict.type.dispose_state, row.disposeState) }}</div>
</template> </template>
...@@ -72,8 +74,8 @@ ...@@ -72,8 +74,8 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="自编码" prop="encode"> <el-form-item label="自编码" prop="encode">
<el-input v-model="postForm.encode" placeholder="自编码" :disabled="nowType != 0 ? true : false" <el-input v-model="postForm.encode" placeholder="自编码"
@change="getRencode"></el-input> :disabled="nowType != 0 ? true : false" @change="getRencode"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -138,23 +140,24 @@ ...@@ -138,23 +140,24 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="地点" prop="place"> <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="处理状态" prop="disposeState"> <el-form-item label="处理状态" prop="disposeState">
<el-select v-model="postForm.disposeState" placeholder="处理状态" clearable style="width: 100%;" <el-select v-model="postForm.disposeState" placeholder="处理状态" clearable style="width: 100%;"
:disabled="nowType == 2 ? true : false"> :disabled="nowType == 2 ? true : false">
<el-option v-for="(item, index) in dict.type.dispose_state" :key="index" :label="item.label" <el-option v-for="(item, index) in dict.type.dispose_state" :key="index"
:value="item.value"></el-option> :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 根据处理状态为1显示repairState下拉框 --> <!-- 根据处理状态为1显示repairState下拉框 -->
<el-form-item v-if="postForm.disposeState === '1'" label="维修状态" prop="repairState"> <el-form-item v-if="postForm.disposeState === '1'" label="维修状态" prop="repairState">
<el-select v-model="postForm.repairState" placeholder="维修状态" clearable style="width: 100%;"> <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" <el-option v-for="(item, index) in dict.type.repair_state" :key="index"
:value="item.value"></el-option> :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -170,7 +173,8 @@ ...@@ -170,7 +173,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="评价" prop="evaluate"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -191,8 +195,8 @@ ...@@ -191,8 +195,8 @@
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@pagination="getList"></pagination> :limit.sync="queryParams.pageSize" @pagination="getList"></pagination>
</div> </div>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/warehousingLedger/index.vue
...@@ -26,41 +26,42 @@ ...@@ -26,41 +26,42 @@
<el-table stripe :data="warehousingLedger" width="100%"> <el-table stripe :data="warehousingLedger" width="100%">
<el-table-column align="center" type="index" width="50" fixed="left" /> <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="inStockType" label="入库类型" fixed="left" show-overflow-tooltip />
<el-table-column align="center" prop="inStockTime" label="入库时间" width="200" 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"> show-overflow-tooltip />
<el-table-column align="center" prop="encode" label="自编码" width="200" fixed="left" show-overflow-tooltip>
</el-table-column> </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>
<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>
<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>
<el-table-column align="center" prop="unit" label="单位"> <el-table-column align="center" prop="unit" label="单位">
</el-table-column> </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 }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div> <div>{{ selectDictLabel(dict.type.affiliation_type, row.affiliationType) }}</div>
</template> </template>
</el-table-column> </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 }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div> <div>{{ selectDictLabel(dict.type.equipment_state, row.equipmentState) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="dateOfProduction" label="安装时间" width="130"> <el-table-column align="center" prop="dateOfProduction" label="安装时间" width="130">
</el-table-column> </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>
<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>
<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>
<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>
<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>
<el-table-column label="操作" width="180" align="center" fixed="right"> <el-table-column label="操作" width="180" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -70,8 +71,8 @@ ...@@ -70,8 +71,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@pagination="getList" /> :limit.sync="queryParams.pageSize" @pagination="getList" />
<!-- 查看对话框 --> <!-- 查看对话框 -->
<el-dialog :title="title" :visible.sync="dialogVisible" width="60%" append-to-body> <el-dialog :title="title" :visible.sync="dialogVisible" width="60%" append-to-body>
......
ruoyi-ui/src/views/whitePage.vue
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
getCode() { getCode() {
dd.getAuthCode({ dd.getAuthCode({
//测试 //测试
//corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69', // corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
//正式 //正式
corpId: 'dingccea40788226c988f2c783f7214b6d69', corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => { 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