Skip to content

D
dd_school
Commit 2afe27cd by zhaopanyu
Options

zpy 8.22

parent 3e7c186b
Showing with 440 additions and 313 deletions
ruoyi-ui/src/api/smartSchool/teachAffairAdministration/ageStatistics/index.js
import request from '@/utils/request'
// 查询学生年级列表
export function listGradeAge() {
export function listGradeAge(schoolYear) {
return request({
url: '/statistics/age',
method: 'get',
})
url: "/statistics/age/" + schoolYear,
method: "get",
});
}
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auinfo.vue
......@@ -13,34 +13,44 @@
<el-form-item label="活动场地">
<el-input :value="infoForm.activityArea"></el-input>
</el-form-item>
<el-form-item label="负责人">
<el-form-item label="具体负责人">
<el-input :value="infoForm.specificUserName"></el-input>
</el-form-item>
<el-form-item label="活动人数">
<el-input :value="infoForm.activityNumber"></el-input>
</el-form-item>
<el-form-item label="预计时长">
<el-input :value="infoForm.duration" readonly></el-input>
</el-form-item>
<el-form-item label="是否彩排">
<el-input :value="displayIsRehearsal" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否录像">
<el-input :value="displayIsRecording" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否直播">
<el-input :value="displayIsLive" readonly></el-input>
<el-input :value="displayIsLive"></el-input>
</el-form-item>
<el-form-item label="申请部门">
<el-input :value="infoForm.applyDept"></el-input>
<el-form-item label="是否需要大屏">
<el-input :value="disisBigScreen"></el-input>
</el-form-item>
<el-form-item label="附件">
<el-input :value="infoForm.fjmc"></el-input>
</el-form-item>
<el-form-item label="申请人">
<el-input :value="infoForm.applyName"></el-input>
</el-form-item>
<el-form-item label="申请时间">
<el-input :value="infoForm.applyTime"></el-input>
<el-form-item label="申请部门">
<el-input :value="infoForm.applyDept"></el-input>
</el-form-item>
<el-form-item label="学校分管领导">
<el-input :value="infoForm.leadershipName"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -69,11 +79,15 @@ export default {
return this.infoForm.isRehearsal === 0 ? '否' : '是';
},
displayIsRecording() {
return this.infoForm.isRehearsal === 0 ? '否' : '是';
return this.infoForm.isVideo === 0 ? '否' : '是';
},
displayIsLive() {
return this.infoForm.isLive === 0 ? '否' : '是';
}
},
disisBigScreen() {
return this.infoForm.isBigScreen === 0 ? '否' : '是';
},
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/autaskResolve.vue
......@@ -6,24 +6,20 @@
</div>
<div>
<el-form ref="postForm" :model="postForm" :rules="rules">
<el-form-item label="处理意见" label-width="80px" required>
<el-select :disabled="$attrs.readOnly" placeholder="常用审批语" v-model="templateComment"
@change="handleSelectChange">
<el-option v-for="dict in dict.type.template_comments" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment">
<el-input type="textarea" :rows="5" :readonly="$attrs.readOnly"
v-model="postForm.comment"></el-input>
</el-form-item>
<el-form-item label="处理结果" label-width="80px" prop="pass">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly"
@change="handleSelectChange(postForm.pass)">
<el-option v-for="dict in dict.type.apply_results" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment" label="处理意见" label-width="80px" required>
<el-input type="textarea" :rows="5" :readonly="$attrs.readOnly"
v-model="postForm.comment"></el-input>
</el-form-item>
</el-form>
<el-row v-if="!$attrs.readOnly" type="flex" justify="center" class="mb20">
<el-button type="primary" size="small" @click="handleSubmit">确认提交
......@@ -75,10 +71,16 @@ export default {
methods: {
/** 处理意见模板选中 */
handleSelectChange(value) {
this.postForm.comment = this.selectDictLabel(this.dict.type.template_comments, value);
console.log('this.postForm.comment', this.postForm.comment);
if (value === "true") {
this.postForm.comment = "审核无误，同意该申请";
} else if (value === "false") {
this.postForm.comment = "不同意该申请";
}
},
/** 【提交】按钮 */
handleSubmit() {
this.$refs.postForm.validate(valid => {
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/index.vue
......@@ -37,6 +37,11 @@
{{ row.isLive == 0 ? "否" : row.isLive == 1 ? "是" : "" }}
</template>
</el-table-column>
<el-table-column label="是否需要大屏" align="center" prop="isBigScreen">
<template slot-scope="{ row }">
{{ row.isBigScreen == 0 ? "否" : row.isBigScreen == 1 ? "是" : "" }}
</template>
</el-table-column>
<el-table-column label="申请部门" align="center" prop="applyDept" />
<el-table-column label="申请人" align="center" prop="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" />
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/purchaseApproval/components/TaskResolve.vue
......@@ -6,23 +6,18 @@
</div>
<div>
<el-form ref="postForm" :model="postForm" :rules="rules">
<el-form-item label="处理意见" label-width="80px" required>
<el-select :disabled="$attrs.readOnly" placeholder="常用审批语" v-model="templateComment"
@change="handleSelectChange">
<el-option v-for="dict in dict.type.template_comments" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment">
<el-input type="textarea" :rows="5" :readonly="$attrs.readOnly" v-model="postForm.comment"></el-input>
</el-form-item>
<el-form-item label="处理结果" label-width="80px" prop="pass">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly" @change="handleSelectChange(postForm.pass)">
<el-option v-for="dict in dict.type.apply_results" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment" label="处理意见" label-width="80px" required>
<el-input type="textarea" :rows="5" :readonly="$attrs.readOnly" v-model="postForm.comment"></el-input>
</el-form-item>
</el-form>
<el-row v-if="!$attrs.readOnly" type="flex" justify="center" class="mb20">
<el-button type="primary" size="small" @click="handleSubmit">确认提交
......@@ -71,7 +66,13 @@ export default {
methods: {
/** 处理意见模板选中 */
handleSelectChange(value) {
this.postForm.comment = this.selectDictLabel(this.dict.type.template_comments, value);
if (value === "true") {
this.postForm.comment = "审核无误，同意该申请";
} else if (value === "false") {
this.postForm.comment = "不同意该申请";
}
},
/** 【提交】按钮 */
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/purchaseApproval/components/TeacherLeaveInfo.vue
......@@ -8,44 +8,96 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="标题">
<el-input :value="infoForm.purchaseName"></el-input>
<el-input v-model="infoForm.purchaseName" readonly></el-input>
</el-form-item>
<el-form-item label="预算项目">
<el-input :value="infoForm.budgetName"></el-input>
<el-input v-model="infoForm.budgetName" readonly></el-input>
</el-form-item>
<el-form-item label="采购费用">
<el-input :value="infoForm.purchaseMoney"></el-input>
<el-form-item label="采购费用(元)">
<el-input v-model="infoForm.purchaseMoney" readonly></el-input>
</el-form-item>
<el-form-item label="申请时间">
<el-input v-model="infoForm.applyTime" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="期望日期">
<el-input v-model="infoForm.expectedDate" readonly></el-input>
</el-form-item>
<el-form-item label="申请部门">
<el-input :value="infoForm.deptName"></el-input>
<el-input v-model="infoForm.deptName" readonly></el-input>
</el-form-item>
<el-form-item label="申请人">
<el-input :value="infoForm.applyUser"></el-input>
</el-form-item>
<el-form-item label="期望日期">
<el-input :value="infoForm.expectedDate"></el-input>
<el-input v-model="infoForm.applyUser" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table :data="purchaseList" style="width: 100%">
<el-table-column type="index" label="序号" width="48"></el-table-column>
<el-table-column prop="assetsTypeName" label="资产分类" align="center">
<template slot-scope="scope">
<span>{{ scope.row.assetsTypeName }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsName" label="资产名称" align="center">
<template slot-scope="{ row }">
<span>{{ row.assetsName }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsSpecs" label="规格型号">
<template slot-scope="{ row }">
<span>{{ row.assetsSpecs }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsUnit" label="单位" align="center">
<template slot-scope="{ row }">
<span>{{ row.assetsUnit }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsPrice" label="单价-元" align="center">
<template slot-scope="{ row }">
<span>{{ row.assetsPrice }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsNumbers" label="数量" align="center">
<template slot-scope="{ row }">
<span>{{ row.assetsNumbers }}</span>
</template>
</el-table-column>
<el-table-column prop="totalPrice" label="小计" align="center">
<template slot-scope="{ row }">
<span>{{ row.assetsPrice * row.assetsNumbers }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="{ row }">
<span>{{ row.remark }}</span>
</template>
</el-table-column>
</el-table>
</el-card>
<TaskResolve v-if="!$attrs.readOnly" :taskId="this.$attrs.taskId" :instanceId="instanceId" :id="id"
v-on="this.$listeners"></TaskResolve>
v-on="this.$listeners"></TaskResolve>
</div>
</template>
<script>
import {purchaseApprovalDetail} from "@/api/smartSchool/indexMould/myTask/teacherLeaveInfo";
import { purchaseApprovalDetail } from "@/api/smartSchool/indexMould/myTask/teacherLeaveInfo";
import TaskResolve from "@/views/smartSchool/indexMould/myTask/purchaseApproval/components/TaskResolve.vue"
export default {
name: "StudentLeaveInfo",
dicts: ['biz_leave_type', 'course_num'],
components: {TaskResolve},
components: { TaskResolve },
props: {
id: {
type: [String, Number],
......@@ -77,16 +129,18 @@ export default {
}
};
return {
purchaseList: [],
disable: true,
limitEndTime,
limitStartTime,
infoForm: {},
form: {},
rules: {
realityStartTime: [
{required: true, message: '实际开始时间不能为空', trigger: 'change'}
{ required: true, message: '实际开始时间不能为空', trigger: 'change' }
],
realityEndTime: [
{required: true, message: '实际结束时间不能为空', trigger: 'change'}
{ required: true, message: '实际结束时间不能为空', trigger: 'change' }
]
},
......@@ -100,6 +154,7 @@ export default {
getDetailInfo() {
purchaseApprovalDetail(this.id).then(res => {
this.infoForm = res.data
this.purchaseList = res.data.list
})
},
......@@ -122,6 +177,4 @@ export default {
}
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/indexMould/myTask/studentLeaveApproval/HandleResolve/TaskResolve.vue
......@@ -6,33 +6,18 @@
</div>
<div>
<el-form ref="postForm" :model="postForm" :rules="rules">
<el-form-item label="处理意见" label-width="80px" required>
<el-select :disabled="$attrs.readOnly"
placeholder="常用审批语"
v-model="templateComment"
@change="handleSelectChange">
<el-option
v-for="dict in dict.type.template_comments"
:key="dict.value"
:value="dict.value"
:label="dict.label"
></el-option>
<el-form-item label="处理结果" label-width="80px" prop="pass">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly" @change="handleSelectChange(postForm.pass)">
<el-option v-for="dict in dict.type.apply_results" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment">
<el-form-item prop="comment" label="处理意见" label-width="80px" required>
<el-input type="textarea" :rows="5" :readonly="$attrs.readOnly" v-model="postForm.comment"></el-input>
</el-form-item>
<el-form-item label="处理结果" label-width="80px" prop="pass">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly">
<el-option
v-for="dict in dict.type.apply_results"
:key="dict.value"
:value="dict.value"
:label="dict.label"
></el-option>
</el-select>
</el-form-item>
</el-form>
<el-row v-if="!$attrs.readOnly" type="flex" justify="center" class="mb20">
<el-button type="primary" size="small" @click="handleSubmit">确认提交</el-button>
......@@ -43,7 +28,7 @@
</template>
<script>
import {complete} from '@/api/smartSchool/indexMould/myTask/teacherLeaveInfo'
import { complete } from '@/api/smartSchool/indexMould/myTask/teacherLeaveInfo'
export default {
name: 'TaskResolve',
......@@ -69,8 +54,8 @@ export default {
templateComment: '',
circleUrl: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
rules: {
comment: [{required: true, message: '处理意见不能为空', trigger: 'change'}],
pass: [{required: true, message: '处理结果不能为空', trigger: 'change'}]
comment: [{ required: true, message: '处理意见不能为空', trigger: 'change' }],
pass: [{ required: true, message: '处理结果不能为空', trigger: 'change' }]
}
}
},
......@@ -78,7 +63,13 @@ export default {
methods: {
/** 处理意见模板选中 */
handleSelectChange(value) {
this.postForm.comment = this.selectDictLabel(this.dict.type.template_comments, value);
if (value === "true") {
this.postForm.comment = "审核无误，同意该申请";
} else if (value === "false") {
this.postForm.comment = "不同意该申请";
}
},
/** 【提交】按钮 */
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/teachLeaveApprove/HandleResolve/TaskResolve.vue
......@@ -6,47 +6,21 @@
</div>
<div>
<el-form ref="postForm" :model="postForm" :rules="rules">
<el-form-item label="处理意见" label-width="100px" required>
<el-select
style="width: 650px"
:disabled="$attrs.readOnly"
placeholder="常用审批语"
v-model="templateComment"
@change="handleSelectChange">
<el-option
v-for="dict in dict.type.template_comments"
:key="dict.value"
:value="dict.value"
:label="dict.label"
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment">
<el-input
type="textarea"
placeholder="请输入处理意见"
:rows="5"
:readonly="$attrs.readOnly"
v-model="postForm.comment"
></el-input>
</el-form-item>
<el-form-item label="处理结果" label-width="80px" prop="pass">
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly">
<el-option
v-for="dict in dict.type.apply_results"
:key="dict.value"
:value="dict.value"
:label="dict.label"
></el-option>
<el-select v-model="postForm.pass" :disabled="$attrs.readOnly" @change="handleSelectChange(postForm.pass)">
<el-option v-for="dict in dict.type.apply_results" :key="dict.value" :value="dict.value"
:label="dict.label"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="comment" label="处理意见" label-width="80px" required>
<el-input type="textarea" :rows="5" :readonly="$attrs.readOnly" v-model="postForm.comment"></el-input>
</el-form-item>
</el-form>
<el-row v-if="!$attrs.readOnly" type="flex" justify="center" class="mb20">
<el-button
type="primary"
size="small"
@click="handleSubmit"
>确认提交
<el-button type="primary" size="small" @click="handleSubmit">确认提交
</el-button>
</el-row>
</div>
......@@ -55,7 +29,7 @@
</template>
<script>
import {complete} from "@/api/smartSchool/teacherManage/teacherLeave";
import { complete } from "@/api/smartSchool/teacherManage/teacherLeave";
export default {
name: "TaskResolve",
......@@ -85,10 +59,10 @@ export default {
circleUrl: "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
rules: {
comment: [
{required: true, message: '处理意见不能为空', trigger: 'change'}
{ required: true, message: '处理意见不能为空', trigger: 'change' }
],
pass: [
{required: true, message: '处理结果不能为空', trigger: 'change'}
{ required: true, message: '处理结果不能为空', trigger: 'change' }
]
}
}
......@@ -96,10 +70,16 @@ export default {
methods: {
/** 处理意见模板选中 */
handleSelectChange(value) {
this.postForm.comment = this.selectDictLabel(this.dict.type.template_comments, value);
;
if (value === "true") {
this.postForm.comment = "审核无误，同意该申请";
} else if (value === "false") {
this.postForm.comment = "不同意该申请";
}
},
/** 【提交】按钮 */
handleSubmit() {
this.$refs.postForm.validate(valid => {
......
ruoyi-ui/src/views/smartSchool/logisticsManage/purchaseInfo/index.vue
......@@ -2,12 +2,10 @@
<div class="app-container">
<el-form ref="queryForm" :model="queryParams" size="small" label-width="80px" inline>
<el-form-item label="标题" prop="purchaseName">
<el-input v-model="queryParams.purchaseName" placeholder="请输入标题" clearable
@keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.purchaseName" placeholder="请输入标题" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="预算项目" prop="budgetName">
<el-input v-model="queryParams.budgetName" placeholder="请输入预算项目" clearable
@keyup.enter.native="handleQuery"/>
<el-input v-model="queryParams.budgetName" placeholder="请输入预算项目" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
......@@ -30,9 +28,9 @@
<!-- </el-row>-->
<el-table v-loading="loading" :data="purchaseList">
<el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
<el-table-column label="标题" align="center" prop="purchaseName"/>
<el-table-column label="标题" align="center" prop="purchaseName" />
<el-table-column label="预算项目" prop="budgetName" align="center"></el-table-column>
<el-table-column label="采购费用(元)" align="center" prop="purchaseMoney"/>
<el-table-column label="采购费用(元)" align="center" prop="purchaseMoney" />
<el-table-column label="期望日期" align="center" prop="expectedDate"></el-table-column>
<el-table-column label="申请部门" align="center" prop="deptName"></el-table-column>
<el-table-column label="申请人" align="center" prop="applyUser">
......@@ -46,9 +44,9 @@
</el-table-column>
</el-table>
<ExPagination v-show="total > 0" :total="total" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum"
@pagination="getList"></ExPagination>
@pagination="getList"></ExPagination>
<!-- 查看详情 -->
<el-dialog :title="title" :visible.sync="openPur" width="680px">
<el-dialog :title="title" :visible.sync="openPur" width="60%">
<el-form ref="form" :model="form" label-width="110px">
<el-row :gutter="20">
<el-col :span="12">
......@@ -78,6 +76,58 @@
</el-col>
</el-row>
</el-form>
<el-table :data="projectDetail" v-loading="loading" style="width: 100%">
<el-table-column type="index" label="序号" width="48"></el-table-column>
<el-table-column prop="assetsTypeName" label="资产分类" align="center" >
<template slot-scope="scope">
<span >{{ scope.row.assetsTypeName }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsName" label="资产名称" align="center" >
<template slot-scope="{ row }">
<span >{{ row.assetsName }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsSpecs" label="规格型号" >
<template slot-scope="{ row }">
<span >{{ row.assetsSpecs }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsUnit" label="单位" align="center" >
<template slot-scope="{ row }">
<span >{{ row.assetsUnit }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsPrice" label="单价-元" align="center" >
<template slot-scope="{ row }">
<span >{{ row.assetsPrice }}</span>
</template>
</el-table-column>
<el-table-column prop="assetsNumbers" label="数量" align="center" >
<template slot-scope="{ row }">
<span >{{ row.assetsNumbers }}</span>
</template>
</el-table-column>
<el-table-column prop="totalPrice" label="小计" align="center">
<template slot-scope="{ row }">
<span>{{ row.assetsPrice * row.assetsNumbers }}</span>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" align="center">
<template slot-scope="{ row }">
<span >{{ row.remark }}</span>
</template>
</el-table-column>
</el-table>
<div slot="footer">
<el-button type="primary" @click="closePage">关 闭</el-button>
</div>
......@@ -88,7 +138,7 @@
</template>
<script>
import {purchaseList, getPurchaseDetail} from "@/api/smartSchool/logisticsManage/purchaseInfo.js"
import { purchaseList, getPurchaseDetail } from "@/api/smartSchool/logisticsManage/purchaseInfo.js"
export default {
name: '',
......@@ -111,6 +161,8 @@ export default {
total: 0,
// 查看对话框
openPur: false,
//查看弹窗表单
projectDetail: [],
// 查看详情表单
form: {},
};
......@@ -147,6 +199,7 @@ export default {
this.openPur = true;
getPurchaseDetail(row.id).then((response) => {
this.form = response.data;
this.projectDetail = response.data.list;
console.log('this.form', this.form);
}).catch(() => {
})
......@@ -164,5 +217,4 @@ export default {
}
};
</script>
<style scoped lang="less">
</style>
<style scoped lang="less"></style>
ruoyi-ui/src/views/smartSchool/logisticsManage/repairReport/index.vue
......@@ -512,7 +512,7 @@ export default {
dispatchRepairs(newObj)
.then((response) => {
this.$modal.closeLoading();
this.$modal.msgSuccess("反馈成功");
this.$modal.msgSuccess("派单成功");
this.openpd = false;
this.formpd.maintainResult = '';
this.getList();
......
ruoyi-ui/src/views/smartSchool/personWork/logisticsWarranty/index.vue
......@@ -37,7 +37,11 @@
<el-table-column align="center" prop="failureEquipment" label="故障设备" />
<el-table-column align="center" prop="failureEquipmentArea" label="设备地点" />
<el-table-column align="center" prop="failureEquipmentDescribe" label="故障描述" />
<el-table-column align="center" prop="maintainResult" label="维修结果" width="100px" />
<el-table-column align="center" prop="maintainResult" label="维修结果" width="100px">
<template slot-scope="{ row }">
{{ row.maintainResult == 1 ? "已维修" : row.maintainResult == 2 ? "无法维修" : '' }}
</template>
</el-table-column>
<el-table-column align="center" prop="maintainState" label="维修状态" width="100px">
<template slot-scope="{ row }">
{{ row.maintainState == 1 ? "未接单" : row.maintainState == 2 ? "维修中" : "已维修 " }}
......@@ -152,7 +156,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="维修结果" prop="maintainResult">
<el-input v-model="form.maintainResult" placeholder="维修结果"></el-input>
<el-input v-model="maintainResultText" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -217,7 +221,7 @@
<!--反馈结果对话框 -->
<el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel">
<el-dialog :title="title" :visible.sync="openfk" width="60%" append-to-body @close="cancel">
<el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px">
<el-form-item label="报修单号" prop="id">
<el-input v-model="formfk.id" placeholder="报修单号"></el-input>
......@@ -229,7 +233,6 @@
<el-select v-model="formfk.maintainResult" placeholder="请选择报修结果">
<el-option label="已维修" value="1"></el-option>
<el-option label="无法维修" value="2"></el-option>
<!-- 添加更多的选项 -->
</el-select>
</el-form-item>
......@@ -265,6 +268,20 @@ import {
export default {
name: 'logisticsWarranty',
dicts: ['maintain_state'],
computed: {
maintainResultText() {
if (this.form.maintainResult === '1') {
return '已维修';
} else if (this.form.maintainResult === '2') {
return '无法维修';
} else {
return '';
}
}
},
data() {
return {
......@@ -320,7 +337,7 @@ export default {
formfk: {
id: "",
maintainResult: "",
maintainState: "3",
maintainState: '3',
evaluate: "",
},
// 是否显示新增弹出层
......@@ -394,11 +411,12 @@ export default {
/** 查看 */
handleLook(row) {
this.form = row;
this.openLook = true;
const id = row.id || this.ids;
getRepairs(id).then(response => {
this.form = response.data;
console.log('this.form', this.form);
this.openLook = true;
console.log(this.form.maintainResult);
}).catch(err => {
})
......@@ -493,7 +511,7 @@ export default {
const newObj = {};
newObj.id = this.formfk.id;
newObj.maintainResult = this.formfk.maintainResult;
newObj.maintainState = this.formfk.maintainState;
newObj.maintainState = '3';
newObj.evaluate = this.formfk.evaluate;
console.log('newObj', newObj);
console.log(newObj.maintainState);
......@@ -536,6 +554,7 @@ export default {
const id = row.id || this.ids;
getRepairs(id).then(response => {
this.formfk.id = response.data.id;
this.formfk = response.data;
console.log('this.form', this.form);
this.openfk = true;
this.formfk.maintainResult = '';
......@@ -546,7 +565,7 @@ export default {
},
}
}
}
</script>
<style>
......
ruoyi-ui/src/views/smartSchool/schoolManage/clockRecord/index.vue
......@@ -2,31 +2,15 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="姓名" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入姓名"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.userName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="日期">
<el-date-picker
style="width: 300px"
v-model="dateRange"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期">
<el-date-picker style="width: 300px" v-model="dateRange" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
</el-form-item>
<el-form-item label="部门" prop="orgname">
<el-input
v-model="queryParams.orgname"
placeholder="请输入部门"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.orgname" placeholder="请输入部门" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -43,47 +27,28 @@
</el-row>
<el-table v-loading="loading" :data="clockRecordList" stripe>
<el-table-column label="序号" type="index" width="55" align="center"/>
<el-table-column label="设备工号" align="center" prop="deviceNum"/>
<el-table-column label="员工工号" align="center" prop="teacherCode"/>
<el-table-column label="姓名" align="center" prop="userName"/>
<el-table-column label="部门" align="center" prop="orgname"/>
<el-table-column label="考勤日期" align="center" prop="clockDate"/>
<el-table-column label="打卡时间" min-width="200px" align="center" prop="times"/>
<el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="设备工号" align="center" prop="deviceNum" />
<el-table-column label="员工工号" align="center" prop="teacherCode" />
<el-table-column label="姓名" align="center" prop="userName" />
<el-table-column label="部门" align="center" prop="orgname" />
<el-table-column label="考勤日期" align="center" prop="clockDate" />
<el-table-column label="打卡时间" min-width="200px" align="center" prop="times" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:clockRecord:edit']"
>删除
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['system:clockRecord:edit']">删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- <pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/> -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 记录导入对话框 -->
<el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<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
>
<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">
......@@ -93,7 +58,7 @@
</div> -->
<span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
@click="importTemplate">下载模板
@click="importTemplate">下载模板
</el-link>
</div>
</el-upload>
......@@ -106,8 +71,8 @@
</template>
<script>
import {listSchoolAtt, deleteRow} from "@/api/smartSchool/schoolManage/clockmanage.js"
import {getToken} from "@/utils/auth";
import { listSchoolAtt, deleteRow } from "@/api/smartSchool/schoolManage/clockmanage.js"
import { getToken } from "@/utils/auth";
export default {
name: 'SchoolManageClockRecord',
......@@ -141,7 +106,7 @@ export default {
// 是否更新已经存在的用户数据
updateSupport: 0,
// 设置上传的请求头部
headers: {Authorization: "Bearer " + getToken()},
headers: { Authorization: "Bearer " + getToken() },
// 上传的地址
url: process.env.VUE_APP_BASE_API + "/schoolAtt/importData"
},
......@@ -206,7 +171,7 @@ export default {
this.upload.open = false;
this.upload.isUploading = 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.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
// 提交上传文件
......@@ -224,5 +189,4 @@ export default {
};
</script>
<style scoped>
</style>
<style scoped></style>
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/age/index.vue
......@@ -2,12 +2,10 @@
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="学年" prop="classYear">
<el-date-picker v-model="queryForm.classYear" clearable type="year" value-format="yyyy" style="width: 100%"
<el-date-picker v-model="queryForm.classYear" type="year" @change="getList" format="yyyy" value-format="yyyy"
placeholder="选择年度"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="gradeAgeList">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
</el-form-item>
</el-form>
......@@ -41,13 +39,11 @@
<script>
import * as echarts from 'echarts';
import { listGradeAge } from "@/api/smartSchool/teachAffairAdministration/ageStatistics";
import { getNewYear } from "@/api/smartSchool/teachAffairAdministration/affairClassView/index.js";
export default {
name: "index",
created() {
this.gradeAgeList();
this.getNowYear();
},
mounted() {
// console.log(echarts, 'create')
// // 基于准备好的dom，初始化echarts实例
......@@ -61,6 +57,12 @@ export default {
data() {
return {
queryForm: {
gradeValue: '',
gradeName: '',
classNum: '',
boyNum: '',
girlNum: '',
allNum: '',
classYear: '',
},
tableData: [],
......@@ -145,18 +147,35 @@ export default {
}
},
created() {
this.newYear();
},
methods: {
gradeAgeList() {
listGradeAge(this.classYear).then((res) => {
this.tableData = res.rows
console.log('this.tableData', this.tableData);
})
},
//获得当前年份
getNowYear() {
this.classYear = new Date().getFullYear() + '';
newYear() {
getNewYear().then((res) => {
//数值类型转换成字符串
this.queryForm.classYear = res.schoolYear + '' ;
console.log('this.queryForm.classYear', typeof this.queryForm.classYear);
this.getList();
});
},
getList() {
this.loading = true;
const classYear = this.queryForm.classYear;
console.log('his.queryForm.classYear', this.queryForm.classYear);
listGradeAge(classYear)
.then(response => {
this.loading = false;
this.tableData = response.rows;
this.total = response.total;
})
.catch(error => {
});
},
// 重置按钮
resetQuery() {
this.getNowYear();
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/class/index.vue
......@@ -2,25 +2,19 @@
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px" @submit.native.prevent>
<el-form-item label="学年" prop="classYear">
<el-date-picker v-model="classYear" type="year" @change="handleQuery" value-format="yyyy"
placeholder="选择年度"></el-date-picker>
<el-date-picker v-model="queryForm.classYear" type="year" @change="getList" format="yyyy" value-format="yyyy"
placeholder="选择年度"></el-date-picker>
</el-form-item>
<el-form-item>
<!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
<el-button
class="ml20"
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出
<el-button class="ml20" type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出
</el-button>
</el-form-item>
</el-form>
<el-table :data="classList" :span-method="arraySpanMethod" border :row-style="{ height: '30px' }"
v-loading="loading" :cell-style="{ padding: '0' }" style="font-size: 14px" stripe>
<el-table :data="classList" :span-method="arraySpanMethod" border :row-style="{ height: '30px' }" v-loading="loading"
:cell-style="{ padding: '0' }" style="font-size: 14px" stripe>
<el-table-column prop="gradeName" label="班级" width="240" align="center"></el-table-column>
<el-table-column prop="className" label="班级" align="center"></el-table-column>
<el-table-column prop="num" label="人数" align="center"></el-table-column>
......@@ -35,8 +29,10 @@
import {
getClassList,
} from '@/api/smartSchool/logisticsManage/affairStatistics'
import { getNewYear } from "@/api/smartSchool/teachAffairAdministration/affairClassView/index.js";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "BudgetApproval",
......@@ -52,42 +48,45 @@ export default {
girlNum: '',
picNum: '',
noPicNum: '',
classYear:'',
},
// 遮罩层
loading: false,
total: 0,
// 信息列表
classList: [],
classYear: '2023',
}
},
created() {
this.getNowYear();
this.getList();
this.newYear();
},
methods: {
// 获取列表
//获得当前年份
newYear() {
getNewYear().then((res) => {
//数值类型转换成字符串
this.queryForm.classYear = res.schoolYear + '';
console.log('this.queryForm.classYear', typeof this.queryForm.classYear);
this.getList();
});
},
getList() {
this.loading = true;
getClassList(this.classYear).then(response => {
this.loading = false;
this.classList = response.rows;
this.total = response.total;
}).catch(() => {
this.loading = false;
})
const classYear = this.queryForm.classYear;
console.log('his.queryForm.classYear', this.queryForm.classYear);
getClassList(classYear)
.then(response => {
this.loading = false;
this.classList = response.rows;
this.total = response.total;
})
.catch(error => {
// ...
});
},
// 搜索按钮
handleQuery() {
this.getList();
},
// 重置按钮
resetQuery() {
this.getNowYear();
this.getList();
},
// 导出按钮
handleExport() {
this.throttle(() => {
......@@ -96,12 +95,10 @@ export default {
}, `班级信息统计${new Date().getTime()}.xlsx`)
})
},
//获得当前年份
getNowYear() {
this.classYear = new Date().getFullYear() + '';
},
// 合并单元格
arraySpanMethod({ rowIndex, columnIndex}) {
arraySpanMethod({ rowIndex, columnIndex }) {
const spanArr = this.getSpanArr(this.classList);
if (columnIndex == 0) {
const _row = spanArr[rowIndex];
......
ruoyi-ui/src/views/smartSchool/teachAffairAdministration/statistics/grade/index.vue
......@@ -2,21 +2,13 @@
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="学年" prop="classYear">
<el-date-picker v-model="classYear" clearable type="year" value-format="yyyy" style="width: 100%"
placeholder="选择年度"></el-date-picker>
</el-form-item>
<el-date-picker v-model="queryForm.classYear" type="year" @change="getList" format="yyyy" value-format="yyyy"
placeholder="选择年度"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['system:assets:export']"
>导出
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['system:assets:export']">导出
</el-button>
</el-form-item>
......@@ -53,13 +45,15 @@
import {
getGradeList,
} from '@/api/smartSchool/logisticsManage/affairStatistics'
import { getNewYear } from "@/api/smartSchool/teachAffairAdministration/affairClassView/index.js";
export default {
name: "index",
data() {
return {
// 查询表单
//数据
queryForm: {
gradeValue: '',
......@@ -68,6 +62,7 @@ export default {
boyNum: '',
girlNum: '',
allNum: '',
classYear: '',
}
,
// 遮罩层
......@@ -75,37 +70,41 @@ export default {
total: 0,
// 信息列表
gradeList: [],
classYear: '2022',
gradeName: ['高中一年级', '高中二年级', '高中三年级']
}
},
created() {
this.getNowYear();
this.getList();
this.newYear();
},
methods: {
// 获取列表
//获得当前年份
newYear() {
getNewYear().then((res) => {
this.queryForm.classYear = res.schoolYear + '';
console.log('this.queryForm.classYear', typeof this.queryForm.classYear);
this.getList();
});
},
getList() {
this.loading = true;
getGradeList(this.classYear).then(response => {
this.loading = false;
this.gradeList = response.rows;
this.total = response.total;
}).catch(err => {
this.loading = false;
})
const classYear = this.queryForm.classYear;
console.log('his.queryForm.classYear', this.queryForm.classYear);
getGradeList(classYear)
.then(response => {
this.loading = false;
this.gradeList = response.rows;
this.total = response.total;
})
.catch(error => {
// ...
});
},
// 搜索按钮
handleQuery() {
this.getList();
},
// 重置按钮
resetQuery() {
this.getNowYear();
this.getList();
},
// 导出按钮
handleExport() {
this.throttle(() => {
......@@ -114,12 +113,9 @@ export default {
}, `年级信息统计${new Date().getTime()}.xlsx`)
})
},
//获得当前年份
getNowYear() {
this.classYear = new Date().getFullYear() + '';
},
//合并单元格
objectSpanMethod({row, column, rowIndex, columnIndex}) {
objectSpanMethod({ row, column, rowIndex, columnIndex }) {
if (columnIndex === 0) {
if (rowIndex === 0 || rowIndex === 4 || rowIndex === 8) {
return {
......
ruoyi-ui/src/views/smartSchool/venueReservation/audreservationStatus/index.vue
......@@ -47,8 +47,7 @@
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" />
<el-table-column label="操作" align="center" fixed="right"
class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- v-if="queryForm.submitState" -->
<div>
......@@ -120,20 +119,17 @@
<el-row style="margin-top: 15px; margin-left: 20px">
<el-col :span="8">
<span class="uploadname" style="font-size: 16px; font-weight: bold">申请人：
<!-- <img v-if="jlqztp" :src="jlqztp">
<span v-else>{{ jlmc }}</span> -->
{{ applyName }}
</span>
</el-col>
<el-col :span="8">
<span class="uploadname" style="font-size: 16px; font-weight: bold">申请部门：
<!-- <img v-if="sjqztp" :src="sjqztp">
<span v-else>{{ sjmc }}</span> -->
{{ applyDept }}
</span>
</el-col>
<el-col :span="8">
<span class="uploadname" style="font-size: 16px; font-weight: bold">学校分管领导：
<!-- <img v-if="sjqztp" :src="sjqztp">
<span v-else>{{ sjmc }}</span> -->
{{ leadershipName }}&nbsp; {{ displayState }}
</span>
</el-col>
</el-row>
......@@ -177,7 +173,14 @@ export default {
dicts: ['vehicle_types', "vehicle_type", "vehicle_state", "vehicle_use_type"],
components: {
Treeselect,
HandleResolve
HandleResolve,
},
computed: {
displayState() {
return this.stateTexts[this.state] || '';
}
},
watch: {
'postForm.departmentId'() {
......@@ -196,6 +199,7 @@ export default {
}
};
return {
stateTexts: ['未提交', '审核中', '审核通过', '审核不通过'],
week: "", // 选择的天数
// 日期范围
dateRange: [],
......@@ -206,6 +210,8 @@ export default {
radio4: 3,
// 提交状态
SubmitState,
// 提交状态
state: "",
// 自定义列表单元格样式
cellStyle: CustomCellStyle,
// 当前选中的状态(未提交， 已提交)
......@@ -308,7 +314,15 @@ export default {
htNumber: "",
// 附件名称
fjmc: "",
applyName: "",
//申请部门
applyDept: "",
// 学校分管领导
leadershipName: "",
//后端传校领导列表
schoolLeaderList: [],
// 分管领导id
leadershipId: '',
// 查看
look: false,
// limitStart: {
......@@ -349,7 +363,23 @@ export default {
},
methods: {
getDisplayState(state) {
switch (state) {
case 0:
return '未提交';
case 1:
return '审核中';
case 2:
return '审核通过';
case 3:
return '审核不通过';
default:
return '';
}
},
/** 获取列表数据 */
getList() {
const params = {
......@@ -389,6 +419,10 @@ export default {
this.isLive = response.data.isLive;
this.htNumber = response.data.htNumber;
this.isBigScreen = response.data.isBigScreen;
this.applyName = response.data.applyName;
this.applyDept = response.data.applyDept;
this.leadershipName = response.data.leadershipName;
this.state = response.data.state;
this.fjmc = response.data.fjmc;
this.loading = false;
this.look = true;
......
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