Skip to content

D
dd_school
Commit 057ad9d4 by zhaopanyu
Options

zpy 11.2

parent 9ab57d6d
Showing with 151 additions and 239 deletions
ruoyi-ui/src/api/smartSchool/schoolProperty/equipmenTledger.js
...@@ -57,8 +57,15 @@ export function deleteEquipmentLedger(id) { ...@@ -57,8 +57,15 @@ export function deleteEquipmentLedger(id) {
**/ **/
export function getUserList(params) { export function getUserList(params) {
return request({ return request({
url: '/equipmentLedger/getUser', url: "/equipmentLedger/getUser",
method: "GET", method: "GET",
params params,
});
}
//获取打印设备条码信息
export function equipmentPrint(ids) {
return request({
url: `/equipmentLedger/getEquipmentledger/${ids}`,
method: "get",
}); });
} }
ruoyi-ui/src/views/smartSchool/gradeWork/infoPublish/index.vue
...@@ -2,17 +2,11 @@ ...@@ -2,17 +2,11 @@
<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="68px">
<el-form-item label="名称" prop="xxfbName"> <el-form-item label="名称" prop="xxfbName">
<el-input <el-input v-model="queryParams.xxfbName" placeholder="请输入名称" clearable @keyup.enter.native="handleQuery" />
v-model="queryParams.xxfbName"
placeholder="请输入名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="xxfbZt"> <el-form-item label="状态" prop="xxfbZt">
<el-select v-model="queryParams.xxfbZt" placeholder="请选择状态" @keyup.enter.native="handleQuery"> <el-select v-model="queryParams.xxfbZt" placeholder="请选择状态" @keyup.enter.native="handleQuery">
<el-option v-for="dict in dict.type.info_push_state" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.info_push_state" :key="dict.value" :label="dict.label" :value="dict.value">
:value="dict.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -31,46 +25,26 @@ ...@@ -31,46 +25,26 @@
</el-row> </el-row>
<el-table v-loading="loading" :data="xxfbList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="xxfbList" @selection-change="handleSelectionChange">
<el-table-column label="序号" align="center" type="index"/> <el-table-column label="序号" align="center" type="index" />
<el-table-column label="名称" min-width="250" align="center" prop="xxfbName"/> <el-table-column label="名称" min-width="250" align="center" prop="xxfbName" />
<el-table-column label="状态" align="center" prop="xxfbZt"> <el-table-column label="状态" align="center" prop="xxfbZt">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.info_push_state" :value="scope.row.xxfbZt"/> <dict-tag :options="dict.type.info_push_state" :value="scope.row.xxfbZt" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="查询次数" align="center" prop="num"/> <el-table-column label="查询次数" align="center" prop="num" />
<el-table-column label="创建时间" align="center" min-width="150" prop="createTime"/> <el-table-column label="创建时间" align="center" min-width="150" prop="createTime" />
<el-table-column label="操作" align="center" min-width="250" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" min-width="250" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.xxfbZt == '1'"> <template v-if="scope.row.xxfbZt == '1'">
<el-button <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>修改
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
>删除
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-search" @click="handleViewDetail(scope.row)">数据
size="mini"
type="text"
icon="el-icon-search"
@click="handleViewDetail(scope.row)"
>数据
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handlePublish(scope.row)">发布
size="mini"
type="text"
icon="el-icon-s-promotion"
@click="handlePublish(scope.row)"
>发布
</el-button> </el-button>
...@@ -93,29 +67,14 @@ ...@@ -93,29 +67,14 @@
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
</template> </template>
<template v-if="scope.row.xxfbZt == '2'"> <template v-if="scope.row.xxfbZt == '2'">
<el-button <el-button size="mini" type="text" icon="el-icon-back" @click="handleRecall(scope.row)"
size="mini" v-hasPermi="['system:xxfb:export']">撤回
type="text"
icon="el-icon-back"
@click="handleRecall(scope.row)"
v-hasPermi="['system:xxfb:export']"
>撤回
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-view" @click="handleViewData(scope.row)"
size="mini" v-hasPermi="['system:xxfb:view']">数据查看
type="text"
icon="el-icon-view"
@click="handleViewData(scope.row)"
v-hasPermi="['system:xxfb:view']"
>数据查看
</el-button> </el-button>
<el-button <el-button size="mini" type="text" icon="el-icon-download" @click="handleExport(scope.row)"
size="mini" v-hasPermi="['system:xxfb:export']">导出
type="text"
icon="el-icon-download"
@click="handleExport(scope.row)"
v-hasPermi="['system:xxfb:export']"
>导出
</el-button> </el-button>
</template> </template>
...@@ -152,18 +111,11 @@ ...@@ -152,18 +111,11 @@
<el-divider></el-divider> <el-divider></el-divider>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="查询名称" prop="xxfbName"> <el-form-item label="查询名称" prop="xxfbName">
<el-input v-model="form.xxfbName" placeholder="请输入名称"/> <el-input v-model="form.xxfbName" placeholder="请输入名称" />
</el-form-item> </el-form-item>
<el-form-item label="级部" prop="gradeId"> <el-form-item label="级部" prop="gradeId">
<treeselect <treeselect v-model="form.gradeId" :options="gradeTree" :show-count="true" @select="deptIdAndName"
v-model="form.gradeId" :disable-branch-nodes="true" :defaultExpandLevel="2" placeholder="请选择级部" />
:options="gradeTree"
:show-count="true"
@select="deptIdAndName"
:disable-branch-nodes="true"
:defaultExpandLevel="2"
placeholder="请选择级部"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- <span style="color: red">*</span>--> <!-- <span style="color: red">*</span>-->
...@@ -173,13 +125,13 @@ ...@@ -173,13 +125,13 @@
<div v-show="isShow"> <div v-show="isShow">
<div <div
style="font-size: 10px; color: #ed5565; font-weight: 400; background: #d8ecf6; border: 1px solid #03b3f5; padding: 10px"> style="font-size: 10px; color: #ed5565; font-weight: 400; background: #d8ecf6; border: 1px solid #03b3f5; padding: 10px">
注：上传excel文件,第一行为数据表头，不允许合并单元格，列名不要重复，第一列为身份证号，第二列为姓名。后续不限制 注：上传excel文件,第一行为数据表头，不允许合并单元格，列名不要重复，第一列为学号，第二列为姓名。后续不限制
</div> </div>
<br/> <br />
<el-table :data="tableData" :border="true" style="width: 100%"> <el-table :data="tableData" :border="true" style="width: 100%">
<!-- <el-table-column type="index" label="序号" width="50">--> <!-- <el-table-column type="index" label="序号" width="50">-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column prop="idCard" min-width="120px" label="身份证号"> <el-table-column prop="schoolNo" min-width="120px" label="学号">
</el-table-column> </el-table-column>
<el-table-column prop="name" label="姓名"> <el-table-column prop="name" label="姓名">
</el-table-column> </el-table-column>
...@@ -198,20 +150,11 @@ ...@@ -198,20 +150,11 @@
<el-table-column label="I"> <el-table-column label="I">
</el-table-column> </el-table-column>
</el-table> </el-table>
<br/> <br/> <br /> <br />
</div> </div>
<el-upload <el-upload style="width: 950px;display: block; margin: 0 auto;" ref="upload" :limit='1' class="upload-demo"
style="width: 950px;display: block; margin: 0 auto;" action="uploadUrl" accept=".xlsx, .xls" :headers="upload.headers" show-file-list
ref="upload" :before-upload="handleBeforeUpload" :http-request="uploadImage">
:limit='1'
class="upload-demo"
action="uploadUrl"
accept=".xlsx, .xls"
:headers="upload.headers"
show-file-list
:before-upload="handleBeforeUpload"
:http-request="uploadImage"
>
<el-button style="width: 950px; display: block; margin: 0 auto; background: #54bbbc; color: white"> <el-button style="width: 950px; display: block; margin: 0 auto; background: #54bbbc; color: white">
点击上传文件 点击上传文件
</el-button> </el-button>
...@@ -227,7 +170,7 @@ ...@@ -227,7 +170,7 @@
<el-dialog :title="title" :visible.sync="edtion" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="edtion" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="60px"> <el-form ref="form" :model="form" :rules="rules" label-width="60px">
<el-form-item label="名称" prop="xxfbName"> <el-form-item label="名称" prop="xxfbName">
<el-input v-model="form.xxfbName" placeholder="请输入名称"/> <el-input v-model="form.xxfbName" placeholder="请输入名称" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -256,7 +199,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"; ...@@ -256,7 +199,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Xxfb", name: "Xxfb",
components: {Treeselect}, components: { Treeselect },
dicts: ['info_push_state'], dicts: ['info_push_state'],
data() { data() {
return { return {
...@@ -276,10 +219,10 @@ export default { ...@@ -276,10 +219,10 @@ export default {
}, },
tableData: [{ tableData: [{
idCard: 'xxxxxxxxxxxxx', schoolNo: 'xxxxxxxxxxxxx',
name: 'xxx', name: 'xxx',
}, { }, {
idCard: 'xxxxxxxxxxxxx', schoolNo: 'xxxxxxxxxxxxx',
name: 'xxx', name: 'xxx',
}], }],
uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传excel uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传excel
...@@ -312,10 +255,10 @@ export default { ...@@ -312,10 +255,10 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
xxfbName: [ xxfbName: [
{required: true, message: "查询名称不能为空", trigger: "blur"} { required: true, message: "查询名称不能为空", trigger: "blur" }
], ],
gradeId: [ gradeId: [
{required: true, message: "级部不能为空", trigger: "blur"} { required: true, message: "级部不能为空", trigger: "blur" }
], ],
}, },
// 级部树 // 级部树
......
ruoyi-ui/src/views/smartSchool/gradeWork/studentManage/parentInfo/index.vue
...@@ -183,7 +183,7 @@ export default { ...@@ -183,7 +183,7 @@ export default {
telephone: [{required: true, message: "联系方式不能为空", trigger: "blur"}], telephone: [{required: true, message: "联系方式不能为空", trigger: "blur"}],
relationship: [{required: true, message: "与学生关系不能为空", trigger: "blur"}], relationship: [{required: true, message: "与学生关系不能为空", trigger: "blur"}],
contactAddress: [{required: true, message: "联系地址不能为空", trigger: "blur"}], contactAddress: [{required: true, message: "联系地址不能为空", trigger: "blur"}],
idCard: [{required: true, message: "身份证号不能为空", trigger: "blur"}], // idCard: [{required: true, message: "身份证号不能为空", trigger: "blur"}],
} }
}; };
}, },
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
...@@ -118,11 +118,10 @@ ...@@ -118,11 +118,10 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item prop="schoolAccessoryList" label="证书照片"> <el-form-item prop="schoolAccessoryList" label="证书照片">
<el-upload v-loading="uploadLoading" class="avatar-uploader" action="#" accept="image/*" <el-upload v-loading="uploadLoading" class="avatar-uploader" :action="uploadFileUrl" accept="image/*"
:show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload" :show-file-list="false" :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
:http-request="uploadImage">
<img v-for="item in form.schoolAccessoryList" :key="item.accessoryUrl" :src="item.accessoryUrl" <img v-for="item in form.schoolAccessoryList" :key="item.accessoryUrl" :src="item.accessoryUrl"
class="avatar" /> class="avatar" />{{ item }}
<i v-if="form.schoolAccessoryList.length === 0" class="el-icon-plus avatar-uploader-icon"></i> <i v-if="form.schoolAccessoryList.length === 0" class="el-icon-plus avatar-uploader-icon"></i>
</el-upload> </el-upload>
...@@ -181,6 +180,7 @@ export default { ...@@ -181,6 +180,7 @@ export default {
components: { picAvatar }, components: { picAvatar },
data() { data() {
return { return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
//缩略图 //缩略图
srcList: [], srcList: [],
// 图片路径 // 图片路径
...@@ -222,7 +222,7 @@ export default { ...@@ -222,7 +222,7 @@ export default {
schoolYear: [ schoolYear: [
{ required: true, message: "学年不能为空", trigger: "change" } { required: true, message: "学年不能为空", trigger: "change" }
], ],
teacherName: [ teacherId: [
{ required: true, message: "教师名称不能为空", trigger: "change" } { required: true, message: "教师名称不能为空", trigger: "change" }
], ],
entrySubject: [ entrySubject: [
...@@ -271,15 +271,15 @@ export default { ...@@ -271,15 +271,15 @@ export default {
console.log('response', response); console.log('response', response);
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
this.competitionData.forEach(item => { // this.competitionData.forEach(item => {
if (item.schoolAccessoryList) { // if (item.schoolAccessoryList) {
item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)]; // item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)];
item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl); // item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
} else { // } else {
item.previewUrls = []; // item.previewUrls = [];
item.pictureUrl = []; // item.pictureUrl = [];
} // }
}); // });
}); });
...@@ -291,18 +291,20 @@ export default { ...@@ -291,18 +291,20 @@ export default {
}, },
// 移除图片 // 移除图片
handleRemove() { handleRemove() {
this.imageUrl = undefined this.schoolAccessoryList = undefined
}, },
// 上传成功回调 // 上传成功回调
handleAvatarSuccess(response, file) { handleAvatarSuccess(response, file) {
console.log('response', response);
console.log('file', file);
// 处理上传成功的逻辑 // 处理上传成功的逻辑
const accessoryUrl = response.data.url; // 假设响应中包含了图片的访问URL const accessoryUrl = this.pev + response.fileName; // 假设响应中包含了图片的访问URL
const accessoryName = file.name; // 获取上传文件的名称 const accessoryName = response.originalFilename; // 获取上传文件的名称
this.form.schoolAccessoryList.push({ this.form.schoolAccessoryList.push({
accessoryUrl: accessoryUrl, accessoryUrl: accessoryUrl,
accessoryName: accessoryName accessoryName: accessoryName
}); });
console.log('this.form.schoolAccessoryList', this.form.schoolAccessoryList);
}, },
// 上传前格式和图片大小限制 // 上传前格式和图片大小限制
...@@ -318,27 +320,7 @@ export default { ...@@ -318,27 +320,7 @@ export default {
return type && isLt2M return type && isLt2M
}, },
// 上传图片
uploadImage(file) {
const fileData = file.file
const formData = new FormData()
formData.append('file', fileData)
this.uploadLoading = true
commonUpload(formData)
.then(response => {
this.uploadLoading = false
this.$modal.msgSuccess('上传成功')
this.imageUrl = process.env.VUE_APP_BASE_API + response.url
// 添加以下代码将文件信息添加到 uploadedFiles 数组中
this.uploadedFiles.push({
accessoryUrl: process.env.VUE_APP_BASE_API + response.url,
accessoryName: fileData.name
})
})
.catch(error => {
this.uploadLoading = false
})
},
//重置 //重置
resetQuery() { resetQuery() {
...@@ -430,16 +412,6 @@ export default { ...@@ -430,16 +412,6 @@ export default {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != "") { if (this.form.id != "") {
// 清空原有图片
this.form.schoolAccessoryList.splice(0);
for (let i = 0; i < this.uploadedFiles.length; i++) {
const file = this.uploadedFiles[i];
this.form.schoolAccessoryList.push({
accessoryUrl: file.accessoryUrl,
accessoryName: file.accessoryName
});
}
updateCompetition(this.form).then(({ code }) => { updateCompetition(this.form).then(({ code }) => {
if (code == 200) { if (code == 200) {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess('修改成功')
...@@ -450,17 +422,6 @@ export default { ...@@ -450,17 +422,6 @@ export default {
this.$modal.msgError("修改失败"); this.$modal.msgError("修改失败");
}); });
} else { } else {
// 清空原有图片
this.form.schoolAccessoryList = [];
for (let i = 0; i < this.uploadedFiles.length; i++) {
const file = this.uploadedFiles[i];
this.form.schoolAccessoryList.push({
accessoryUrl: file.accessoryUrl,
accessoryName: file.accessoryName
});
}
addCompetition(this.form).then(response => { addCompetition(this.form).then(response => {
console.log(this.form, 'this.form'); console.log(this.form, 'this.form');
this.$modal.msgSuccess('新增成功') this.$modal.msgSuccess('新增成功')
......
ruoyi-ui/src/views/smartSchool/massOrganization/communityStyle/index.vue
...@@ -409,7 +409,7 @@ export default { ...@@ -409,7 +409,7 @@ export default {
id: this.form.id, id: this.form.id,
theme: this.form.theme, theme: this.form.theme,
// file: this.form.file, // file: this.form.file,
file:this.uploadList.toString()
}; };
console.log(params, "params"); console.log(params, "params");
editCommunityInfo(params) editCommunityInfo(params)
...@@ -468,7 +468,6 @@ export default { ...@@ -468,7 +468,6 @@ export default {
const data = { const data = {
id: row.id, id: row.id,
}; };
this.$modal this.$modal
.confirm() .confirm()
.then(() => { .then(() => {
......
ruoyi-ui/src/views/smartSchool/personWork/lendingRecords/index.vue
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
<el-table-column label="型号" align="center" prop="model" /> <el-table-column label="型号" align="center" prop="model" />
<el-table-column label="借用日期" align="center" prop="borrowTime" /> <el-table-column label="借用日期" align="center" prop="borrowTime" />
<el-table-column label="借用人" align="center" prop="borrowBy" /> <el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="归还状态" align="center" prop="returnState">
<template slot-scope="scope">
<dict-tag :options="dict.type.return_state" :value="scope.row.returnState"></dict-tag>
</template>
</el-table-column>
<el-table-column label="用途" align="center" prop="purpose" /> <el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限" align="center" prop="deadline" /> <el-table-column label="借用期限" align="center" prop="deadline" />
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
...@@ -80,6 +85,14 @@ ...@@ -80,6 +85,14 @@
<el-input v-model="postForm.deadline" /> <el-input v-model="postForm.deadline" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="归还状态" prop="returnState">
<el-select v-model="postForm.returnState" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.return_state" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -100,7 +113,7 @@ import { ...@@ -100,7 +113,7 @@ import {
listTeacherjyxq listTeacherjyxq
} from "@/api/smartSchool/personWork/propertyManagement"; } from "@/api/smartSchool/personWork/propertyManagement";
export default { export default {
dicts: ['return_state'],
data() { data() {
return { return {
queryParams: { queryParams: {
......
ruoyi-ui/src/views/smartSchool/personWork/repairRecord/index.vue
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="报修时间:" prop="reportrepairtime"> <el-form-item label="报修时间:" prop="reportRepairTime">
<el-date-picker v-model="postForm.reportrepairtime" type="date" style="width: 100%;" <el-date-picker v-model="postForm.reportRepairTime" type="date" style="width: 100%;"
value-format="yyyy-MM-dd" clearable></el-date-picker> value-format="yyyy-MM-dd" clearable></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -656,7 +656,7 @@ export default { ...@@ -656,7 +656,7 @@ export default {
console.log(encodes, 'encodes'); console.log(encodes, 'encodes');
const printListParam = encodeURIComponent(JSON.stringify(this.printList)); const printListParam = encodeURIComponent(JSON.stringify(this.printList));
dd.biz.util.openLink({ dd.biz.util.openLink({
url: `${baseUrl}?ids=${ids}&encodes=${encodes}&printList=${printListParam}`, url: `${baseUrl}?ids=${ids}`,
onSuccess: () => { onSuccess: () => {
console.log('跳转成功，准备打印'); console.log('跳转成功，准备打印');
// 打印条码 // 打印条码
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/printBarcodes.vue
...@@ -50,7 +50,9 @@ import { getToken } from "@/utils/auth"; ...@@ -50,7 +50,9 @@ import { getToken } from "@/utils/auth";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import QRCode from "qrcodejs2"; // 生成二维码插件 import QRCode from "qrcodejs2"; // 生成二维码插件
import printJS from "print-js"; // 打印插件 import printJS from "print-js"; // 打印插件
import {
equipmentPrint
} from "../../../../api/smartSchool/schoolProperty/equipmenTledger";
export default { export default {
name: "index", name: "index",
...@@ -81,22 +83,28 @@ export default { ...@@ -81,22 +83,28 @@ export default {
}; };
}, },
created() { created() {
const ids = this.$route.query.ids; this.getList();
const encodes = this.$route.query.encodes;
const printList = JSON.parse(decodeURIComponent(this.$route.query.printList));
this.printBarcodes(ids, encodes, printList);
}, },
methods: { methods: {
getList() {
this.loading = true
const ids = this.$route.query.ids;
console.log(ids, 'ids');
equipmentPrint(ids).then(res => {
this.printList = res;
console.log(this.printList, 'this.printList');
this.chooseList = res;
console.log(this.chooseList, 'this.chooseList');
this.loading = false
this.printBarcodes();
})
},
//生成批量打印条码 //生成批量打印条码
printBarcodes(ids, encodes, printList) { printBarcodes() {
this.printDialog = true; this.printDialog = true;
console.log(ids, encodes);
this.printList = [...printList];
this.chooseList = [...this.printList];
console.log(this.chooseList, '122');
this.$nextTick(() => { this.$nextTick(() => {
this.printList.map((item, index) => { this.printList.map((item, index) => {
const domPrint = document.getElementById(`print${index}`).lastElementChild; const domPrint = document.getElementById(`print${index}`).lastElementChild;
......
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
...@@ -27,14 +27,14 @@ ...@@ -27,14 +27,14 @@
<el-table-column label="借用人" align="center" prop="borrowBy" /> <el-table-column label="借用人" align="center" prop="borrowBy" />
<el-table-column label="用途" align="center" prop="purpose" /> <el-table-column label="用途" align="center" prop="purpose" />
<el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" /> <el-table-column label="借用期限（天）" align="center" prop="deadline" width="140" />
<el-table-column label="归还日期" align="center" prop="returnTime" width="160" /> <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="returnEquipmentCondition" width="160">
<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" />
<el-table-column label="预计使用时间" align="center" prop="yjuseTime" width="160" /> <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="sjuseTime" width="160" />
<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">
...@@ -137,17 +137,19 @@ ...@@ -137,17 +137,19 @@
</el-row> </el-row>
<el-row :gutter="30"> <el-row :gutter="30">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="预计使用时间" prop="yjuseTime"> <el-form-item label="预计使用期限" prop="yjuseTime">
<el-date-picker v-model="lendReturnForm.yjuseTime" type="datetime" clearable class="selectWidth" <el-date-picker v-model="lendReturnForm.yjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择预计使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false"> placeholder="请选择" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="实际使用时间" prop="sjuseTime"> <el-form-item label="实际使用时间" prop="sjuseTime">
<el-date-picker v-model="lendReturnForm.sjuseTime" type="datetime" clearable class="selectWidth" <!-- <el-date-picker v-model="lendReturnForm.sjuseTime" type="datetime" clearable class="selectWidth"
placeholder="请选择实际使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false"> placeholder="请选择实际使用时间" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2 ? true : false">
</el-date-picker> </el-date-picker> -->
<el-input v-model="lendReturnForm.sjuseTime" placeholder="请输入" :disabled="nowType == 2 ? true : false"
type="number"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/lessonManage/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-card style="height: 950px"> <el-card style="height: 950px" class="scrollable-card">
<el-form :model="queryParams" style="border-bottom: 1px solid #dfe6ec; padding: 10px 0 0 5px"> <el-form :model="queryParams" style="border-bottom: 1px solid #dfe6ec; padding: 10px 0 0 5px">
<el-form-item label="班级信息" prop="schoolYear"> <el-form-item label="班级信息" prop="schoolYear">
<el-select v-model="queryParams.schoolYear" @change="getTreeData" style="width: 100%" size="mini"> <el-select v-model="queryParams.schoolYear" @change="getTreeData" style="width: 100%" size="mini">
...@@ -678,6 +678,10 @@ export default { ...@@ -678,6 +678,10 @@ export default {
padding-right: 0px; padding-right: 0px;
} }
.scrollable-card {
overflow: auto;
}
/*.dragBox[data-v-86c11aba] {*/ /*.dragBox[data-v-86c11aba] {*/
/* font-size: 20px;*/ /* font-size: 20px;*/
/* width: 100%;*/ /* width: 100%;*/
......
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