Skip to content

D
dd_school
Commit 51fd68fa by zhaopanyu
Options

zpy 7.19

parent 2a23e4fd
Showing with 403 additions and 141 deletions
ruoyi-ui/src/api/smartSchool/indexMould/myTask/audApplicationapproval/index.js 0 → 100644
import request from "@/utils/request";
// 礼堂申请审批待办列表
export function audiDetail(data) {
return request({
url: "/auditorium/taskList",
method: "get",
data: data,
});
}
/** 礼堂预约申请审批*/
export function completelt({ taskId, instanceId, comment, pass }) {
return request({
url: `/auditorium/complete/${taskId}/${instanceId}`,
method: "post",
data: {
comment,
pass,
},
});
}
// 查询礼堂申请已办列表
export function taskDoneList() {
return request({
url: "/auditorium/taskDoneList",
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/indexMould/myTask/depBudgetapproval/index.js 0 → 100644
import request from "@/utils/request";
// 查看科室预算待办列表
export function departiDetail(data) {
return request({
url: "/departmentBudget/taskList",
method: "get",
data: data,
});
}
/** 科室预算填报审批*/
export function complete({ taskId, instanceId, comment, pass }) {
return request({
url: `departmentBudget/complete/${taskId}/${instanceId}`,
method: "post",
data: {
comment,
pass,
},
});
}
// 查看科室预算已办列表
export function taskDoneList() {
return request({
url: "/departmentBudget/taskDoneList",
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/personWork/auditoriumReservation/index.js
...@@ -3,13 +3,12 @@ import request from "@/utils/request"; ...@@ -3,13 +3,12 @@ import request from "@/utils/request";
// 查询礼堂预约列表 // 查询礼堂预约列表
export function listAuditor(query) { export function listAuditor(query) {
return request({ return request({
url: "/auditorium/list", url: "/auditorium/listGr",
method: "get", method: "get",
params: query, params: query,
}); });
} }
// 新增礼堂预约 // 新增礼堂预约
export function addAuditor(data) { export function addAuditor(data) {
return request({ return request({
...@@ -49,18 +48,13 @@ export function submitAuditor(id) { ...@@ -49,18 +48,13 @@ export function submitAuditor(id) {
url: "/auditorium/submitApply/" + id, url: "/auditorium/submitApply/" + id,
method: "post", method: "post",
}); });
} }
//获取校领导下拉框 //获取校领导下拉框
export function getGradeOfficeDirectorList() { export function getLeaderList(data) {
return request({ return request({
url: "/school/teacherLeave/getSchoolLeader" , url: "/school/teacherLeave/getSchoolLeader",
params: form,
method: "get", method: "get",
params: data,
}); });
} }
ruoyi-ui/src/enums/home/index.js
...@@ -46,13 +46,13 @@ export const approves = [ ...@@ -46,13 +46,13 @@ export const approves = [
}, },
{ {
label: "礼堂申请审批", label: "礼堂申请审批",
name: "audApplicationapproval", name: "auditoriumNum",
icon: "food", icon: "food",
path: "/indexMould/myTask/audApplicationapproval", path: "/indexMould/myTask/audApplicationapproval",
}, },
{ {
label: "科室预算审批", label: "科室预算审批",
name: "depBudgetapproval", name: "departmentBudgetNum",
icon: "teacher", icon: "teacher",
path: "/indexMould/myTask/depBudgetapproval", path: "/indexMould/myTask/depBudgetapproval",
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhandleResolv.vue
<template> <template>
<!-- 办理 -->
<div style="height: 100%;"> <div style="height: 100%;">
<el-dialog :visible.sync="open" :modal="false" :fullscreen="true" :modal-append-to-body="false" :show-close="false"> <el-dialog :visible.sync="open" :modal="false" :fullscreen="true" :modal-append-to-body="false" :show-close="false">
<template slot="title"> <template slot="title">
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhishandleResolve.vue
<template> <template>
<!-- 历史 -->
<div style="height: 100%;"> <div style="height: 100%;">
<el-dialog :visible.sync="open" :modal="false" :fullscreen="true" :modal-append-to-body="false" :show-close="false"> <el-dialog :visible.sync="open" :modal="false" :fullscreen="true" :modal-append-to-body="false" :show-close="false">
<template slot="title"> <template slot="title">
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auinfo.vue
...@@ -8,32 +8,40 @@ ...@@ -8,32 +8,40 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="活动名称"> <el-form-item label="活动名称">
<el-input :value="infoForm.purchaseName"></el-input> <el-input :value="infoForm.activityName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="活动地点"> <el-form-item label="活动场地">
<el-input :value="infoForm.budgetName"></el-input> <el-input :value="infoForm.activityArea"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="负责人"> <el-form-item label="负责人">
<el-input :value="infoForm.purchaseMoney"></el-input> <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>
<el-form-item label="活动人数">
<el-input :value="infoForm.deptName"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否彩排"> <el-form-item label="是否彩排">
<el-input :value="infoForm.deptName"></el-input> <el-input :value="infoForm.isRehearsal"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="书否录像">
<el-input :value="infoForm.applyUser"></el-input> </el-col>
<el-col :span="12">
<el-form-item label="是否录像">
<el-input :value="infoForm.isRehearsal"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否直播"> <el-form-item label="是否直播">
<el-input :value="infoForm.expectedDate"></el-input> <el-input :value="infoForm.isLive"></el-input>
</el-form-item>
<el-form-item label="申请部门">
<el-input :value="infoForm.applyDept"></el-input>
</el-form-item>
<el-form-item label="申请人">
<el-input :value="infoForm.applyName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请部门"> <el-form-item label="申请时间">
<el-input :value="infoForm.expectedDate"></el-input> <el-input :value="infoForm.applyTime"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -45,8 +53,12 @@ ...@@ -45,8 +53,12 @@
</template> </template>
<script> <script>
import { purchaseApprovalDetail } from "@/api/smartSchool/indexMould/myTask/teacherLeaveInfo"; import {
import TaskResolve from "@/views/smartSchool/indexMould/myTask/purchaseApproval/components/TaskResolve.vue"
getAuditor,// 查看详情
} from "@/api/smartSchool/personWork/auditoriumReservation";
import TaskResolve from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/autaskResolve.vue"
export default { export default {
name: "auinfo", name: "auinfo",
...@@ -104,8 +116,9 @@ export default { ...@@ -104,8 +116,9 @@ export default {
methods: { methods: {
/** 获取详情 */ /** 获取详情 */
getDetailInfo() { getDetailInfo() {
purchaseApprovalDetail(this.id).then(res => { getAuditor(this.id).then(res => {
this.infoForm = res.data this.infoForm = res.data
console.log(111,this.infoForm);
}) })
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/autaskResolve.vue
...@@ -35,8 +35,11 @@ ...@@ -35,8 +35,11 @@
</template> </template>
<script> <script>
import { complete } from "@/api/smartSchool/index/purchaseApproval.js"; import {
completelt,/** 礼堂预约申请审批*/
} from "@/api/smartSchool/indexMould/myTask/audApplicationapproval";
export default { export default {
name: "TaskResolve", name: "TaskResolve",
dicts: ['template_comments', 'apply_results'], dicts: ['template_comments', 'apply_results'],
...@@ -54,7 +57,7 @@ export default { ...@@ -54,7 +57,7 @@ export default {
return { return {
postForm: { postForm: {
comment: '', comment: '',
pass: "1", pass: "true",
}, },
// 意见模板 // 意见模板
templateComment: '', templateComment: '',
...@@ -86,7 +89,7 @@ export default { ...@@ -86,7 +89,7 @@ export default {
if (valid) { if (valid) {
this.$modal.loading('正在提交数据，请稍等...'); this.$modal.loading('正在提交数据，请稍等...');
complete({ completelt({
taskId: this.$attrs.taskId, taskId: this.$attrs.taskId,
instanceId: this.instanceId, instanceId: this.instanceId,
comment: this.postForm.comment, comment: this.postForm.comment,
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/index.vue
...@@ -11,22 +11,22 @@ ...@@ -11,22 +11,22 @@
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<div class="task-right-content"> <div class="task-right-content">
<el-form :model="queryParams" :inline="true" style="padding:0 0 0 0" size="small"> <el-form :model="queryParams" :inline="true" style="padding:0 0 0 0" size="small">
</el-form> </el-form>
<el-table :data="tableData" v-loading="loading"> <el-table :data="tableData">
<el-table-column prop="lesson" label="序号" width="60" type="index" align="center" <el-table-column prop="lesson" label="序号" width="60" type="index" align="center"
style="height: 20px;" /> style="height: 20px;" />
<el-table-column prop="hdmc" label="活动名称" align="center" /> <el-table-column prop="activityName" label="活动名称" align="center" />
<el-table-column label="活动地点" align="center" prop="budgetName" /> <el-table-column label="活动地点" align="center" prop="activityArea" />
<el-table-column label="负责人" align="center" prop="purchaseMoney" /> <el-table-column label="负责人" align="center" prop="specificUserName" />
<el-table-column label="活动人数" align="center" prop="expectedDate" /> <el-table-column label="活动人数" align="center" prop="activityNumber" />
<el-table-column prop="deptName" label="是否彩排" align="center" /> <el-table-column prop="isRehearsal" label="是否彩排" align="center" />
<el-table-column label="是否录像" align="center" prop="applyUser" /> <el-table-column label="是否录像" align="center" prop="isVideo" />
<el-table-column label="是否直播" align="center" prop="sfzb" /> <el-table-column label="是否直播" align="center" prop="isVideo" />
<el-table-column label="申请部门" align="center" prop="applydepart" /> <el-table-column label="申请部门" align="center" prop="applyDept" />
<el-table-column label="申请人" align="center" prop="applypeople" /> <el-table-column label="申请人" align="center" prop="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" /> <el-table-column label="申请时间" align="center" prop="applyTime" />
<el-table-column label="操作" align="center" width="80"> <el-table-column label="操作" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -61,11 +61,9 @@ ...@@ -61,11 +61,9 @@
<script> <script>
import { import {
queryMyClaim, taskDoneList, //查询礼堂申请已办列表
getTaskDoneList, audiDetail,// 礼堂申请审批待办列表
complete, } from "@/api/smartSchool/indexMould/myTask/audApplicationapproval";
getTaskListe,
} from "@/api/smartSchool/index/purchaseApproval.js";
import auhandleResolv from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhandleResolv.vue"; import auhandleResolv from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhandleResolv.vue";
import hisHandleResolve from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhishandleResolve.vue"; import hisHandleResolve from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auhishandleResolve.vue";
...@@ -84,9 +82,7 @@ export default { ...@@ -84,9 +82,7 @@ export default {
// pageSize: 10, // pageSize: 10,
}, },
tableData: [ tableData: [
{
hdmc:'活动',
}
], ],
// 存储行数据 // 存储行数据
rowData: {}, rowData: {},
...@@ -115,7 +111,7 @@ export default { ...@@ -115,7 +111,7 @@ export default {
console.log("历史人物") console.log("历史人物")
this.isTaskListe = false this.isTaskListe = false
this.loading = true; this.loading = true;
getTaskDoneList().then((response) => { taskDoneList().then((response) => {
this.tableData = response.rows this.tableData = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
...@@ -124,7 +120,7 @@ export default { ...@@ -124,7 +120,7 @@ export default {
console.log("金额人物") console.log("金额人物")
this.loading = true; this.loading = true;
this.isTaskListe = true this.isTaskListe = true
getTaskListe().then((response) => { audiDetail().then((response) => {
this.tableData = response.rows this.tableData = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
...@@ -140,12 +136,12 @@ export default { ...@@ -140,12 +136,12 @@ export default {
pageSize: 10, pageSize: 10,
} }
this.isTaskListe = true this.isTaskListe = true
// getTaskListe().then((response) => { audiDetail().then((response) => {
// this.tableData = response.rows this.tableData = response.rows
// // console.log(response.rows); // console.log(response.rows);
// this.loading = false this.loading = false
// }); });
}, },
// 搜索查询 // 搜索查询
...@@ -154,7 +150,7 @@ export default { ...@@ -154,7 +150,7 @@ export default {
this.isTaskListe = true this.isTaskListe = true
// console.log(445566); // console.log(445566);
getTaskListe(this.queryParams.purchaseName).then((response) => { audiDetail(this.queryParams.purchaseName).then((response) => {
// this.tableData = response.rows // this.tableData = response.rows
console.log(response.rows); console.log(response.rows);
// this.loading = false // this.loading = false
...@@ -178,12 +174,18 @@ export default { ...@@ -178,12 +174,18 @@ export default {
this.process.id = row.id; this.process.id = row.id;
this.process.taskId = row.taskId; this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看 this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName this.rowData.applyUserName = row.applyUserName;
this.rowData.applyUser = row.applyUser this.rowData.activityName = row.activityName;
this.rowData.deptName = row.deptName this.rowData.activityArea = row.activityArea;
this.rowData.expectedDate = row.expectedDate this.rowData.activityTime = row.activityTime;
this.rowData.purchaseMoney = row.purchaseMoney this.rowData.htNumber = row.htNumber;
this.rowData.budgetName = row.budgetName this.rowData.specificUserName = row.specificUserName;
this.rowData.activityNumber = row.activityNumber;
this.rowData.isRehearsal = row.isRehearsal;
this.rowData.isVideo = row.isVideo;
this.rowData.isBigScreen = row.isBigScreen;
this.rowData.applyName = row.applyName;
this.rowData.applyDept = row.applyDept;
}, },
/**历史 */ /**历史 */
...@@ -194,12 +196,18 @@ export default { ...@@ -194,12 +196,18 @@ export default {
this.process.id = row.id; this.process.id = row.id;
this.process.taskId = row.taskId; this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看 this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName this.rowData.applyUserName = row.applyUserName;
this.rowData.applyUser = row.applyUser this.rowData.activityName = row.activityName;
this.rowData.deptName = row.deptName this.rowData.activityArea = row.activityArea;
this.rowData.expectedDate = row.expectedDate this.rowData.activityTime = row.activityTime;
this.rowData.purchaseMoney = row.purchaseMoney this.rowData.htNumber = row.htNumber;
this.rowData.budgetName = row.budgetName this.rowData.specificUserName = row.specificUserName;
this.rowData.activityNumber = row.activityNumber;
this.rowData.isRehearsal = row.isRehearsal;
this.rowData.isVideo = row.isVideo;
this.rowData.isBigScreen = row.isBigScreen;
this.rowData.applyName = row.applyName;
this.rowData.applyDept = row.applyDept;
}, },
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/components/deinfo.vue
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="科室"> <el-form-item label="科室">
<el-input :value="infoForm.purchaseName"></el-input> <el-input :value="infoForm.deptName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="填报人"> <el-form-item label="填报人">
<el-input :value="infoForm.budgetName"></el-input> <el-input :value="infoForm.informant"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="分管领导"> <el-form-item label="分管领导">
<el-input :value="infoForm.deptName"></el-input> <el-input :value="infoForm.leadershipName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="填报时间"> <el-form-item label="填报时间">
<el-input :value="infoForm.applyUser"></el-input> <el-input :value="infoForm.tbTime"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -33,13 +33,15 @@ ...@@ -33,13 +33,15 @@
</template> </template>
<script> <script>
import { purchaseApprovalDetail } from "@/api/smartSchool/indexMould/myTask/teacherLeaveInfo"; import {
import detaskResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/detaskResolve.vue" queryDepart,//查看本单位预算填报列表;
} from '@/api/smartSchool/officialWork/budgetFilling'
import TaskResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/detaskResolve.vue"
export default { export default {
name: "auinfo", name: "deinfo",
dicts: ['biz_leave_type', 'course_num'], dicts: ['biz_leave_type', 'course_num'],
components: { detaskResolve }, components: { TaskResolve },
props: { props: {
id: { id: {
type: [String, Number], type: [String, Number],
...@@ -92,7 +94,7 @@ export default { ...@@ -92,7 +94,7 @@ export default {
methods: { methods: {
/** 获取详情 */ /** 获取详情 */
getDetailInfo() { getDetailInfo() {
purchaseApprovalDetail(this.id).then(res => { queryDepart(this.id).then(res => {
this.infoForm = res.data this.infoForm = res.data
}) })
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/components/detaskResolve.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</template> </template>
<script> <script>
import { complete } from "@/api/smartSchool/index/purchaseApproval.js"; import { complete } from "@/api/smartSchool/indexMould/myTask/depBudgetapproval";
export default { export default {
name: "TaskResolve", name: "TaskResolve",
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/index.vue
...@@ -15,12 +15,11 @@ ...@@ -15,12 +15,11 @@
<el-form :model="queryParams" :inline="true" style="padding:0 0 0 0" size="small"> <el-form :model="queryParams" :inline="true" style="padding:0 0 0 0" size="small">
</el-form> </el-form>
<el-table :data="tableData" v-loading="loading"> <el-table :data="tableData" v-loading="loading">
<el-table-column prop="nd" label="年度" width="60" type="index" align="center" <el-table-column prop="year" label="年度" width="60" type="index" align="center" style="height: 20px;" />
style="height: 20px;" /> <el-table-column prop="deptName" label="科室" align="center" />
<el-table-column prop="ks" label="科室" align="center" /> <el-table-column label="填报人" align="center" prop="informant" />
<el-table-column label="填报人" align="center" prop="budgetName" /> <el-table-column label="分管领导" align="center" prop="leadershipName" />
<el-table-column label="分管领导" align="center" prop="purchaseMoney" /> <el-table-column label="填报时间" align="center" prop="tbTime" />
<el-table-column label="填报时间" align="center" prop="applyTime" />
<el-table-column label="操作" align="center" width="80"> <el-table-column label="操作" align="center" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="isTaskListe" type="text" size="mini" icon="el-icon-edit" <el-button v-if="isTaskListe" type="text" size="mini" icon="el-icon-edit"
...@@ -54,11 +53,11 @@ ...@@ -54,11 +53,11 @@
<script> <script>
import { import {
queryMyClaim, taskDoneList,// 查看科室预算已办列表
getTaskDoneList,
complete, complete,
getTaskListe, departiDetail,// 查看科室预算待办列表
} from "@/api/smartSchool/index/purchaseApproval.js";
} from "@/api/smartSchool/indexMould/myTask/depBudgetapproval";
import HandleResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/dehandleResolv.vue"; import HandleResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/dehandleResolv.vue";
import hisHandleResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/dehishandleResolve.vue"; import hisHandleResolve from "@/views/smartSchool/indexMould/myTask/depBudgetapproval/components/dehishandleResolve.vue";
...@@ -108,7 +107,7 @@ export default { ...@@ -108,7 +107,7 @@ export default {
console.log("历史人物") console.log("历史人物")
this.isTaskListe = false this.isTaskListe = false
this.loading = true; this.loading = true;
getTaskDoneList().then((response) => { taskDoneList().then((response) => {
this.tableData = response.rows this.tableData = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
...@@ -117,7 +116,7 @@ export default { ...@@ -117,7 +116,7 @@ export default {
console.log("金额人物") console.log("金额人物")
this.loading = true; this.loading = true;
this.isTaskListe = true this.isTaskListe = true
getTaskListe().then((response) => { departiDetail().then((response) => {
this.tableData = response.rows this.tableData = response.rows
this.total = response.total this.total = response.total
this.loading = false this.loading = false
...@@ -133,12 +132,12 @@ export default { ...@@ -133,12 +132,12 @@ export default {
pageSize: 10, pageSize: 10,
} }
this.isTaskListe = true this.isTaskListe = true
// getTaskListe().then((response) => { departiDetail().then((response) => {
// this.tableData = response.rows this.tableData = response.rows
// // console.log(response.rows); // console.log(response.rows);
// this.loading = false this.loading = false
// }); });
}, },
// 搜索查询 // 搜索查询
...@@ -146,8 +145,8 @@ export default { ...@@ -146,8 +145,8 @@ export default {
// this.loading = true; // this.loading = true;
this.isTaskListe = true this.isTaskListe = true
// console.log(445566); // console.log(445566);
getTaskListe(this.queryParams.purchaseName).then((response) => { departiDetail().then((response) => {
// this.tableData = response.rows this.tableData = response.rows
console.log(response.rows); console.log(response.rows);
// this.loading = false // this.loading = false
...@@ -170,12 +169,12 @@ export default { ...@@ -170,12 +169,12 @@ export default {
this.process.id = row.id; this.process.id = row.id;
this.process.taskId = row.taskId; this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看 this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName this.rowData.year = row.year
this.rowData.applyUser = row.applyUser
this.rowData.deptName = row.deptName this.rowData.deptName = row.deptName
this.rowData.informant = row.informant
this.rowData.expectedDate = row.expectedDate this.rowData.expectedDate = row.expectedDate
this.rowData.purchaseMoney = row.purchaseMoney this.rowData.leadershipName = row.leadershipName
this.rowData.budgetName = row.budgetName this.rowData.tbTime = row.tbTime
}, },
/**历史 */ /**历史 */
...@@ -186,12 +185,12 @@ export default { ...@@ -186,12 +185,12 @@ export default {
this.process.id = row.id; this.process.id = row.id;
this.process.taskId = row.taskId; this.process.taskId = row.taskId;
this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看 this.process.readOnly = readOnly; // 主要用来判断是否为历史任务。或者是申请人查看
this.rowData.purchaseName = row.purchaseName this.rowData.year = row.year
this.rowData.applyUser = row.applyUser
this.rowData.deptName = row.deptName this.rowData.deptName = row.deptName
this.rowData.informant = row.informant
this.rowData.expectedDate = row.expectedDate this.rowData.expectedDate = row.expectedDate
this.rowData.purchaseMoney = row.purchaseMoney this.rowData.leadershipName = row.leadershipName
this.rowData.budgetName = row.budgetName this.rowData.tbTime = row.tbTime
}, },
}, },
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/components/SelectUser.vue 0 → 100644
<template>
<el-dialog :visible.sync="openDialog" :title="title" :width="width" @close="dialogClose">
<!-- 模糊查询-->
<el-form :model="form" ref="form" size="small" inline>
<el-form-item prop="teacherName" label="姓名">
<el-input v-model.trim="form.teacherName" placeholder="请输入姓名" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item prop="teacherTel" label="联系电话">
<el-input v-model.trim="form.teacherTel" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
</el-form-item>
<el-form-item>
<el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
<el-button @click="reset" icon="el-icon-refresh" size="mini">重置</el-button>
</el-form-item>
</el-form>
<!-- 列表数据-->
<el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
@row-click="rowClick">
<el-table-column type="selection" align="center"></el-table-column>
<el-table-column v-if="execute === 'leaderList'" key="avatar" prop="avatar" label="头像" align="center">
<template slot-scope="scope">
<el-image :src="baseURL + scope.row.avatar" :preview-src-list="[baseURL + scope.row.avatar]"
class="custom-image radius-image">
<template slot="error">
{{ }}
</template>
</el-image>
</template>
</el-table-column>
<el-table-column v-if="execute != 'leaderList'" key="teacherCode" prop="teacherCode" label="教师编号"
align="center"></el-table-column>
<el-table-column key="teacherName" prop="teacherName" label="姓名" align="center"></el-table-column>
<el-table-column key="teacherTel" prop="teacherTel" label="联系电话" align="center"></el-table-column>
<el-table-column key="sex" prop="sex" label="性别" align="center">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"></dict-tag>
</template>
</el-table-column>
</el-table>
<!-- 分页-->
<pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
@pagination="search"></pagination>
<!-- 底部-->
<div slot="footer">
<el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
<el-button @click="quit" size="small">取 消</el-button>
</div>
</el-dialog>
</template>
<script>
import {
getLeaderList,//获取校领导下拉框
} from "@/api/smartSchool/personWork/auditoriumReservation";
export default {
name: "SelectUser",
dicts: ['sys_user_sex'],
props: {
open: {
type: Boolean,
require: true
},
title: {
type: String,
default: ''
},
width: {
type: [Number, String],
default: '50%'
},
execute: {
type: [String]
},
// 选择级部、处室主任
id: {
type: [Number, String]
}
},
data() {
return {
baseURL: process.env.VUE_APP_BASE_API,
form: {
teacherName: '',
teacherTel: '',
pageNum: 1,
pageSize: 10
},
total: 0,
loading: false,
userList: [],
selectUser: null
}
},
computed: {
openDialog: {
get() {
return this.open;
},
set(value) {
this.$emit('update:open', value);
}
}
},
watch: {
open(value) {
if (value) {
this.$nextTick(() => {
this.reset();
})
}
}
},
methods: {
/** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
async search() {
if (isNaN(Number(this.id))) {
console.error('Invalid ID');
return;
}
try {
this.loading = true;
const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
this.userList = response.rows || [];
this.total = response.total;
this.loading = false;
} catch (exception) {
this.loading = false;
throw new Error(exception);
}
},
/** 重置表单 */
reset() {
this.form = {
teacherName: '',
teacherTel: '',
pageNum: 1,
pageSize: 10
};
this.resetForm('form');
this.search();
},
/** 选项选中发生变化 */
selectionChange(selections) {
this.selectUser = selections[0];
},
/** 点击选中、取消 */
rowClick(row, column) {
this.$refs['tableList'].clearSelection();
this.$refs['tableList'].toggleRowSelection(row, true);
},
/** 提交选中 */
submit() {
this.$emit('select', {
id: this.selectUser.id,
name: this.selectUser.teacherName,
tel: this.selectUser.teacherTel
});
this.quit();
},
/** 取消 */
quit() {
this.openDialog = false;
},
/** 分管领导、主要领导 */
leaderList(form) {
return getLeaderList(form);
},
dialogClose() {
this.userList = []
}
}
}
</script>
<style scoped>
.footer {
display: flex;
justify-content: center;
margin-top: 30px;
}
.radius-image {
border-radius: 40px;
}
</style>
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/components/SelectUser.vue
...@@ -3,12 +3,10 @@ ...@@ -3,12 +3,10 @@
<!-- 模糊查询--> <!-- 模糊查询-->
<el-form :model="form" ref="form" size="small" inline> <el-form :model="form" ref="form" size="small" inline>
<el-form-item prop="teacherName" label="姓名"> <el-form-item prop="teacherName" label="姓名">
<el-input v-model.trim="form.teacherName" placeholder="请输入姓名" clearable <el-input v-model.trim="form.teacherName" placeholder="请输入姓名" clearable @keyup.enter.native="search"></el-input>
@keyup.enter.native="search"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="teacherTel" label="联系电话"> <el-form-item prop="teacherTel" label="联系电话">
<el-input v-model.trim="form.teacherTel" placeholder="请输入联系电话" clearable <el-input v-model.trim="form.teacherTel" placeholder="请输入联系电话" clearable @keyup.enter.native="search"></el-input>
@keyup.enter.native="search"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button> <el-button @click="search" type="primary" icon="el-icon-search" size="mini">搜索</el-button>
...@@ -16,18 +14,13 @@ ...@@ -16,18 +14,13 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- 列表数据--> <!-- 列表数据-->
<el-table <el-table ref="tableList" v-loading="loading" :data="userList" @selection-change="selectionChange"
ref="tableList" @row-click="rowClick">
v-loading="loading"
:data="userList"
@selection-change="selectionChange"
@row-click="rowClick"
>
<el-table-column type="selection" align="center"></el-table-column> <el-table-column type="selection" align="center"></el-table-column>
<el-table-column v-if="execute === 'leaderList'" key="avatar" prop="avatar" label="头像" align="center"> <el-table-column v-if="execute === 'leaderList'" key="avatar" prop="avatar" label="头像" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image :src="baseURL + scope.row.avatar" :preview-src-list="[baseURL + scope.row.avatar]" <el-image :src="baseURL + scope.row.avatar" :preview-src-list="[baseURL + scope.row.avatar]"
class="custom-image radius-image"> class="custom-image radius-image">
<template slot="error"> <template slot="error">
{{ }} {{ }}
</template> </template>
...@@ -35,7 +28,7 @@ ...@@ -35,7 +28,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="execute != 'leaderList'" key="teacherCode" prop="teacherCode" label="教师编号" <el-table-column v-if="execute != 'leaderList'" key="teacherCode" prop="teacherCode" label="教师编号"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column key="teacherName" prop="teacherName" label="姓名" align="center"></el-table-column> <el-table-column key="teacherName" prop="teacherName" label="姓名" align="center"></el-table-column>
<el-table-column key="teacherTel" prop="teacherTel" label="联系电话" align="center"></el-table-column> <el-table-column key="teacherTel" prop="teacherTel" label="联系电话" align="center"></el-table-column>
<el-table-column key="sex" prop="sex" label="性别" align="center"> <el-table-column key="sex" prop="sex" label="性别" align="center">
...@@ -45,13 +38,8 @@ ...@@ -45,13 +38,8 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页--> <!-- 分页-->
<pagination <pagination v-show="total > 0" :total="total" :limit.sync="form.pageSize" :page.sync="form.pageNum"
v-show="total > 0" @pagination="search"></pagination>
:total="total"
:limit.sync="form.pageSize"
:page.sync="form.pageNum"
@pagination="search"
></pagination>
<!-- 底部--> <!-- 底部-->
<div slot="footer"> <div slot="footer">
<el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button> <el-button :disabled="!selectUser" @click="submit" type="primary" size="small">确 定</el-button>
...@@ -62,8 +50,10 @@ ...@@ -62,8 +50,10 @@
<script> <script>
import {getGradeOfficeDirectorList, getLeaderList} from "@/api/smartSchool/personWork/leaveApply"; import {
getLeaderList,//获取校领导下拉框
} from "@/api/smartSchool/personWork/auditoriumReservation";
export default { export default {
name: "SelectUser", name: "SelectUser",
dicts: ['sys_user_sex'], dicts: ['sys_user_sex'],
...@@ -126,13 +116,14 @@ export default { ...@@ -126,13 +116,14 @@ export default {
methods: { methods: {
/** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */ /** 搜索（交给子组件维护，当然也可以把接口交给父组件处理） */
async search() { async search() {
// if (!this.id || Number(this.id) === NaN) { if (isNaN(Number(this.id))) {
if (!this.id || isNaN(this.id)) { console.error('Invalid ID');
throw TypeError('级部/处室id应为非空数字类型！'); return;
} }
try { try {
this.loading = true; this.loading = true;
const response = await this[this.execute]({applyOrgid: this.id, ...this.form}); const response = await this[this.execute]({ applyOrgid: this.id, ...this.form });
this.userList = response.rows || []; this.userList = response.rows || [];
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
...@@ -141,6 +132,7 @@ export default { ...@@ -141,6 +132,7 @@ export default {
throw new Error(exception); throw new Error(exception);
} }
}, },
/** 重置表单 */ /** 重置表单 */
reset() { reset() {
this.form = { this.form = {
...@@ -158,6 +150,7 @@ export default { ...@@ -158,6 +150,7 @@ export default {
}, },
/** 点击选中、取消 */ /** 点击选中、取消 */
rowClick(row, column) { rowClick(row, column) {
console.log('row', row);
this.$refs['tableList'].clearSelection(); this.$refs['tableList'].clearSelection();
this.$refs['tableList'].toggleRowSelection(row, true); this.$refs['tableList'].toggleRowSelection(row, true);
}, },
...@@ -175,10 +168,7 @@ export default { ...@@ -175,10 +168,7 @@ export default {
this.openDialog = false; this.openDialog = false;
}, },
/** 级部、处室主任选择 */
gradeOfficeDirector(form) {
return getGradeOfficeDirectorList(form);
},
/** 分管领导、主要领导 */ /** 分管领导、主要领导 */
leaderList(form) { leaderList(form) {
......
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