Skip to content

D
dd_school
Commit 6d04da99 by duxingshan
Options

部分细节修改

parent 32060d3d
Showing with 69 additions and 29 deletions
ruoyi-ui/src/router/routerMenus/teachAffairAdministration/index.js
......@@ -147,7 +147,23 @@ export default [
}
},
]
}
},
// 后勤管理/预算采购/资金使用明细 2023-08-16 DXS
{
path: '/logisticsManage',
component: Layout,
hidden: true,
permissions: ['childrenHealth:earlyChildhoodSyndrome:archivesManagement:birthday:index'],
children: [
{
path: 'detailsofFundusage',
component: () => import('@/views/smartSchool/logisticsManage/detailsofFundusage'),
name: 'teacherList',
meta: {
title: '资金使用明细'
}
}
]
},
]
ruoyi-ui/src/views/smartSchool/schoolManage/introduce/schoolInfo/index.vue
......@@ -69,6 +69,7 @@
<script>
import picAvatar from "@/views/smartSchool/schoolManage/introduce/schoolInfo/profile/picAvatar";
import {getInfo, editInfo} from "@/api/smartSchool/schoolManage/introduce/introduce";
import { closeCurrentTab } from "../../../../../utils/utilLibrary/routerBatch/routerBatch";
export default {
name: "index",
......@@ -160,14 +161,21 @@ export default {
if (response.code === 200) {
this.$modal.msgSuccess("修改成功");
this.getSchoolIntroduce()
//关闭当前页面 2023-08-16 DXS
this.closeCurrentTab(true)
// 关闭当前tab页签，打开新页签
const obj = {path: "/schoolManage/campusInfo"};
this.$tab.closeOpenPage(obj);
// const obj = {path: "/schoolManage/campusInfo"};
// this.$tab.closeOpenPage(obj);
// localStorage.setItem('gardenEmblem',this.formData.gardenEmblem)
}
})
})
},
closeCurrentTab,
resetForm() {
this.$refs['elForm'].resetFields()
},
......
ruoyi-ui/src/views/smartSchool/schoolManage/schoolMoments/components/schoolMomentsDetail/index.vue
......@@ -207,6 +207,7 @@ import {ExportType} from "@/enums/common"
import {TimeName} from '@/enums/schedule/schoolMomentsDetail'
import {CustomCellStyle} from '@/enums/customStyle';
import {getDicts} from '@/api/system/dict/data'
import { closeCurrentTab } from "../../../../../../utils/utilLibrary/routerBatch/routerBatch";
export default {
name: 'SchoolMomentsDetail',
......@@ -426,10 +427,13 @@ export default {
this.exportOptions.open = false;
},
// 关闭按钮 2023-08-16 DXS
closeCurrentTab,
// 关闭按钮
handleClose() {
const path = {path: '/schoolManage/season'};
this.$tab.closeOpenPage(path);
this.closeCurrentTab(true)
// const path = {path: '/schoolManage/season'};
// this.$tab.closeOpenPage(path);
},
// 多选框选择数据
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
......@@ -486,7 +486,6 @@ export default {
Object.keys(this.form).forEach(key => {
res.data[key] && (this.form[key] = res.data[key])
})
console.log("this.form",this.form)
}
})
}
......@@ -505,7 +504,7 @@ export default {
//表单提交
submitForm(){
const useId = this.form.useId
this.form.useName = this.userList.find(item=>item.userId == useId).userName
this.form.useName = useId == ''?'':this.userList.find(item=>item.userId == useId).userName
this.$refs['form'].validate((valid) => {
if (valid) {
if(this.nowOptionType == 0){
......
ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue
......@@ -82,15 +82,15 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="借用日期" prop="borrowTime">
<el-date-picker v-model="lendReturnForm.borrowTime" type="date" clearable class="selectWidth"
placeholder="请选择借用日期" format="yyyy-MM-dd" :disabled="nowType == 2?true:false">
<el-date-picker v-model="lendReturnForm.borrowTime" type="datetime" clearable class="selectWidth"
placeholder="请选择借用日期" value-format="yyyy-MM-dd HH:mm:ss" :disabled="nowType == 2?true:false">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="归还日期" prop="returnTime">
<el-date-picker v-model="lendReturnForm.returnTime" type="date" clearable class="selectWidth"
placeholder="请选择归还日期" format="yyyy-MM-dd" :disabled="nowType == 2?true:false">
<el-date-picker v-model="lendReturnForm.returnTime" type="datetime" clearable class="selectWidth"
placeholder="请选择归还日期" value-format="yyyy-MM-dd HH:mm:ss":disabled="nowType == 2?true:false">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -103,8 +103,11 @@
</el-col>
<el-col :span="12">
<el-form-item label="归还时设备情况" prop="returnEquipmentCondition">
<el-input v-model="lendReturnForm.returnEquipmentCondition" placeholder="请输入归还时设备情况"
:disabled="nowType == 2?true:false"></el-input>
<el-select v-model="lendReturnForm.returnEquipmentCondition" clearable
placeholder="请选择归还时设备情况">
<el-option v-for="(item, index) in dict.type.equipment_state" :key="index" :label="item.label"
:value="item.value" :disabled="nowType == 2?true:false"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
......@@ -128,15 +131,15 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="预计使用时间" prop="yjuseTime">
<el-date-picker v-model="lendReturnForm.yjuseTime" type="date" clearable class="selectWidth"
placeholder="请选择预计使用时间" format="yyyy-MM-dd" :disabled="nowType == 2?true:false">
<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">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实际使用时间" prop="sjuseTime">
<el-date-picker v-model="lendReturnForm.sjuseTime" type="date" clearable class="selectWidth"
placeholder="请选择实际使用时间" format="yyyy-MM-dd" :disabled="nowType == 2?true:false">
<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">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -170,6 +173,7 @@ import { getUserList } from "../../../../api/smartSchool/schoolProperty/equipmen
import { getAdmin } from '@/api/smartSchool/schoolProperty/classiFication.js'
export default {
dicts: ['equipment_state'],
data() {
return {
queryParams: {
......@@ -334,6 +338,7 @@ export default {
if(res.code == 200){
this.$message.success("删除成功！")
}
this.getList()
})
}).catch(() => {
this.$message({
......@@ -347,7 +352,9 @@ export default {
//表单提交
submitForm(){
const borrowById = this.lendReturnForm.borrowById
this.lendReturnForm.borrowBy = borrowById ==''?'':this.userList.find(item=>item.userId == borrowById).userName
this.lendReturnForm.borrowBy = borrowById == ''?'':this.userList.find(item=>item.userId == borrowById).userName
const receivedById = this.lendReturnForm.receivedById
this.lendReturnForm.receivedBy = receivedById == ''?'':this.adminUserList.find(item=>item.adminId == receivedById).admin
this.$refs['lendReturnForm'].validate((valid) => {
if (valid) {
if(this.nowType == 1){
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassManage/index.vue
......@@ -400,7 +400,7 @@ import {getToken} from "@/utils/auth";
import {TempGrades, TEXT_SIZE_ONE_HU, TEXT_SIZE_ONE_TH, TEXT_SIZE_TEL} from "@/enums/common";
export default {
name: "index",
name: "AffairClassManage",
dicts: ["Class", "Grade", "grade_type", "section_type"],
components: {TeacherSelect, PicAvatar},
data() {
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/affairClassManage/teacherList/index.vue
......@@ -36,7 +36,7 @@
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="el-icon-close" size="mini" @click="closePage"
<el-button type="info" plain icon="el-icon-close" size="mini" @click="closeCurrentTab"
v-hasPermi="['system:teacher:close']">关闭
</el-button>
</el-col>
......@@ -106,6 +106,7 @@ import {
import TeacherSelect from '@/views/components/moduleComponets/TeacherSelect/index.vue'
import {listInform, teacherListInform} from '@/api/smartSchool/teacherManage/teacherInformation'
import {listSubject} from '@/api/smartSchool/course/index'
import {closeCurrentTab} from "../../../../../utils/utilLibrary/routerBatch/routerBatch";
export default {
name: 'affairClassManage_teacherList',
......@@ -158,6 +159,8 @@ export default {
},
methods: {
closeCurrentTab, //关闭当前页面
getList() {
const gradeId = this.$route.query && this.$route.query.gradeId
......@@ -284,14 +287,17 @@ export default {
closePage() {
// window.history.back(-1);
// this.$tab.closeOpenPage({path: '/class/handleClass'});
console.log(this.route)
let path
if (this.routeBack == 1) {
path = {path: '/classAdviser/classManage'}
} else {
path = {path: '/teachAffairAdministration/affairClassManage'}
}
this.$tab.closeOpenPage(path)
// console.log("sssss", window.location.pathname)
let path = { path: window.location.pathname }
// console.log("path", path)
// if (this.routeBack == 1) {
// path = {path: '/classAdviser/classManage'}
// } else {
// path = {path: '/teachAffairAdministration/affairClassManage'}
// }
// let path = {path: '/classAdviser/classManage'}
this.$router.go(-1)
this.$tab.closePage(path)
},
// 获取教师信息
......
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