Skip to content

D
dd_school
Commit 6c00b577 by zhaopanyu
Options

zpy 7.17

parent d6075f55
Showing with 483 additions and 107 deletions
ruoyi-ui/src/api/smartSchool/logisticsManage/budgetFillingfollows.js
......@@ -12,7 +12,5 @@ export function depBudget(id) {
return request({
url: "/departmentBudget/" + id,
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/logisticsManage/departmentBudgetview.js
import request from "@/utils/request";
//查看全部预算填报列表
//查询科室预算填报项目明细列表
export function getksBudgetList(query) {
return request({
url: "/departmentBudgetProjectmx/list",
......
ruoyi-ui/src/api/smartSchool/logisticsManage/detailsofFundusage.js 0 → 100644
import request from "@/utils/request";
//查询列表
export function getListlb(query) {
return request({
url: "/purchaseApproval/selectPurchaseList",
method: "get",
params: query,
});
}
// 查看详情
export function getListxq(id) {
return request({
url: "/purchaseApproval/selectRegisterById/" + id,
method: "get",
});
}
ruoyi-ui/src/api/smartSchool/personWork/auditoriumReservation/index.js
......@@ -53,9 +53,9 @@ export function submitAuditor(id) {
//获取校领导下拉框
export function getGradeOfficeDirectorList(form) {
export function getGradeOfficeDirectorList() {
return request({
url: "/school/teacherLeave/getDeptLeader/" + form.applyOrgid,
url: "/school/teacherLeave/getSchoolLeader" ,
params: form,
method: "get",
});
......
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetApproval/index.vue
......@@ -14,9 +14,10 @@
<treeselect v-model="queryForm.deptId" :options="deptOptions" :show-count="true" :defaultExpandLevel="2"
style="width: 200px" placeholder="请选择科室" />
</el-form-item>
<el-form-item label="是否政府采购" prop="sfzfcg">
<el-select v-model="queryForm.sfzfcg" placeholder="是否政府采购" clearable>
<el-option v-for="item in options" :key="item.value" :value="item.value" :label="item.label"></el-option>
<el-form-item label="是否政府采购" prop="isGov">
<el-select v-model="queryForm.isGov" placeholder="请选择是否为政府采购" style="width: 100%">
<el-option label="是" value="0"></el-option>
<el-option label="否" value="1"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -65,13 +66,13 @@
<el-table-column label="批复总额（万元）" prop="giveMoney" align="center" class-name="inline-table">
</el-table-column>
<el-table-column label="已使用金额（万元）" prop="amountSpent" align="center" class-name="inline-table">
<!-- <template slot-scope="scope">
<template slot-scope="scope">
<div>
<a href="javascript:;" @click="handleLandClick(scope.row)" style="color: dodgerblue">{{ scope.row.glqdwmc
}}</a>
<a @click="handleAmountClick(scope.row)">{{ scope.row.amountSpent }}</a>
</div>
</template> -->
</template>
</el-table-column>
<el-table-column label="是否政府采购" prop="isGov" align="center">
<template slot-scope="scope">
{{ scope.row.isGov === '0' ? '是' : '否' }}
......@@ -107,10 +108,8 @@
<el-input v-model="postForm.budgetName" placeholder="请输入项目名称"></el-input>
</el-form-item>
<el-form-item label="政府采购" prop="isGov">
<el-select v-model="postForm.isGov" style="width: 100%">
<el-option label="是" value="0"></el-option>
<el-option label="否" value="1"></el-option>
</el-select>
<el-input v-model="isGovConvert">
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -211,6 +210,16 @@ export default {
components: {
Treeselect
},
computed: {
isGovConvert: {
get() {
return this.queryForm.isGov === '0' ? '是' : '否'
},
set(val) {
this.queryForm.isGov = val
}
}
},
data() {
return {
// 查询表单
......@@ -225,6 +234,8 @@ export default {
pageNum: 1,
pageSize: 10
},
// 是否政府采购
isGovConvert: "",
// 遮罩层
loading: false,
total: 0,
......@@ -234,7 +245,7 @@ export default {
postForm: {
schoolBudgetDetailsList: []
},
options:[],
options: [],
// 是否显示弹出层
open: false,
// 校验规则
......@@ -297,13 +308,22 @@ export default {
return Number(Number(value).toFixed(precision)) || 0;
},
//点击出现弹窗
handleLandClick(rowData) {
handleLandClick(rowData) {
// 构建目标页面 URL，假设为 /detail，同时传递 rowData 中的必要参数
const detailUrl = '/detail?id=' + rowData.id; // 假设传递 id 参数
// 使用页面跳转方法，例如 Vue Router
this.$router.push(detailUrl);
console.log(1222, row.projectName);
},
// 已使用金额操作
handleAmountClick(row) {
this.$router.push({
path: "/logisticsManage/detailsofFundusage",
query: { projectName: row.projectName }
});
},
// 获取列表
getList() {
......
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetFillingfollows/index.vue
......@@ -42,7 +42,7 @@
<el-button class="btnup" @click="cancel">关 闭</el-button>
</div>
<div>
<h2 class="title">{{ year }}年{{ deptName }}科室预算</h2>
<h2 class="title">{{ form.year }}年{{ form.deptName }}科室预算</h2>
<div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">单位:万元</div>
</div>
<!-- 表格数据 -->
......@@ -51,7 +51,11 @@
<el-table-column prop="projectName" label="项目名称" align="center" />
<el-table-column prop="content" label="申报政策依据、理由及主要内容" width="300" align="center" />
<el-table-column label="项目支出明细" prop="projectExpenditures" align="center" />
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" width="200" />
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" width="200">
<template slot-scope="scope">
{{ scope.row.isGovernmentPurchase === '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="申请金额" prop="applyMoney" align="center" width="200" />
<el-table-column label="备注" prop="remark" align="center" width="200" />
......@@ -194,6 +198,7 @@ export default {
this.lookTable = response.data.schoolDepartmentBudgetProjectmxList;
this.form.year = response.data.year;
this.form.deptName = response.data.deptName;
console.log(this.form.year, this.form.deptName);
console.log(response.data);
this.openLook = true;
this.$modal.closeLoading();
......
ruoyi-ui/src/views/smartSchool/logisticsManage/departmentBudgetview/index.vue
......@@ -13,10 +13,10 @@
<el-form-item prop="deptName">
<el-input v-model="queryForm.deptName" placeholder="科室" clearable> </el-input>
</el-form-item>
<el-form-item prop="isGovernmentPurchase">
<el-select v-model="queryForm.isGovernmentPurchase" placeholder="是否政府采购" clearable>
<el-option v-for="item in options" :key="item.value" :value="item.value"
:label="item.label"></el-option>
<el-form-item prop="isGov">
<el-select v-model="queryForm.isGov" placeholder="是否政府采购" style="width: 100%">
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......@@ -33,7 +33,11 @@
<el-table-column label="申报政策依据、理由及主要内容" prop="content" width="300px" align="center" />
<el-table-column label="项目明细" prop="projectExpenditures" align="center" />
<el-table-column label="申报金额（万元）" prop="applyMoney" align="center" />
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" />
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center">
<template slot-scope="scope">
{{ scope.row.isGovernmentPurchase === '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" align="center" />
<el-table-column label="操作" align="center">
<template slot-scope="scope">
......@@ -53,7 +57,7 @@
<el-button class="btnup" @click="cancel">关 闭</el-button>
</div>
<div>
<h2 class="title">{{ year }}年{{ deptName }}科室预算</h2>
<h2 class="title">{{ form.year }}年{{ form.deptName }}科室预算</h2>
<div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">单位:万元</div>
</div>
<!-- 表格数据 -->
......@@ -65,7 +69,6 @@
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" width="200" />
<el-table-column label="申请金额" prop="applyMoney" align="center" width="200" />
<el-table-column label="备注" prop="remark" align="center" width="200" />
</el-table>
<el-row style="margin-top: 15px;margin-left: 20px;">
<el-col :span="14">
......@@ -94,10 +97,21 @@ import {
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "BudgetApproval",
name: "departmentBudgetview",
computed: {
isGovConvert: {
get() {
return this.queryForm.isGov === '0' ? '是' : '否'
},
set(val) {
this.queryForm.isGov = val
}
}
},
data() {
return {
// 是否政府采购
// isGovConvert: "",
// 年
year: "",
// 科室名
......@@ -168,7 +182,6 @@ export default {
// 获取列表
getList() {
getksBudgetList(this.queryForm).then(response => {
this.loading = false;
this.budgetList = response.rows;
......@@ -204,18 +217,18 @@ export default {
// 查看按钮
handleLook(row) {
this.openLook = true;
depBudget(row.id).then(response => {
console.log(222, response);
const id = row.id || this.ids
depBudget(id).then(response => {
console.log(222, response.data);
this.lookTable.projectName = response.data.projectName;
this.lookTable.content = response.data.content;
this.lookTable.projectExpenditures = response.data.projectExpenditures;
this.lookTable.isGovernmentPurchase = response.data.isGovernmentPurchase;
this.lookTable.applyMoney = response.data.applyMoney;
this.lookTable.remark = response.data.remark;
this.form.year = response.data.year;
this.form.deptName = response.data.deptName;
this.$modal.closeLoading();
}).catch(err => {
......
ruoyi-ui/src/views/smartSchool/logisticsManage/detailsofFundusage/index.vue
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="86px">
<el-form-item prop="title">
<el-input size="small" v-model="queryParams.yyrxm" placeholder="标题" clearable />
</el-form-item>
<el-form-item prop="title">
<el-input size="small" v-model="queryParams.yyrxm" placeholder="预算项目" clearable />
<el-form-item prop="purchaseName">
<el-input size="small" v-model="queryParams.purchaseName" placeholder="标题" clearable />
</el-form-item>
<!-- <el-form-item prop="budgetName">
<el-input size="small" v-model="queryParams.budgetName" placeholder="预算项目" clearable />
</el-form-item> -->
<el-form-item class="ml20">
<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>
......@@ -14,14 +14,13 @@
</el-form>
<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="申请部门" align="center" prop="userName" />
<el-table-column label="申请人" align="center" prop="orgname" />
<el-table-column label="申请时间" align="center" min-width="200px" prop="times" />
<el-table-column label="标题" align="center" prop="purchaseName" />
<el-table-column label="采购费用-元" align="center" prop="purchaseMoney" />
<el-table-column label="期望日期" align="center" prop="budgetName" />
<el-table-column label="预算项目" align="center" prop="budgetName" />
<el-table-column label="申请部门" align="center" prop="deptName" />
<el-table-column label="申请人" align="center" prop="applyUser" />
<el-table-column label="申请时间" align="center" min-width="200px" prop="applyTime" />
<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-edit" @click="handleEdit(scope.row)">详情
......@@ -31,74 +30,54 @@
</el-table>
<!--详情对话框 -->
<el-dialog width="1050px" :visible.sync="open" :title="title" append-to-body @close="cancel">
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-row>
<el-col :span="12">
<el-form-item label="标题">
<el-input v-model="postForm.bt" placeholder="请输入标题"></el-input>
<el-input v-model="postForm.purchaseName" placeholder="请输入标题"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预算项目">
<el-input v-model="postForm.ysxm" placeholder="请输入预算项目"></el-input>
<el-input v-model="postForm.budgetName" placeholder="请输入预算项目"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="采购费用-元">
<el-input v-model="postForm.cgfy" placeholder="请输入采购费用-元"></el-input>
<el-input v-model="postForm.purchaseMoney" placeholder="请输入采购费用-元"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="期望日期">
<el-input v-model="postForm.ysxm" placeholder="请输入期望日期"></el-input>
<el-input v-model="postForm.expectedDate" placeholder="请输入期望日期"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="预算项目">
<el-input v-model="postForm.cgfy" placeholder="请输入预算项目"></el-input>
<el-form-item label="申请部门">
<el-input v-model="postForm.deptName" placeholder="请输入申请部门"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请部门">
<el-input v-model="postForm.ysxm" placeholder="请输入申请部门"></el-input>
<el-form-item label="申请人">
<el-input v-model="postForm.applyUser" placeholder="请输入申请人"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="申请人">
<el-input v-model="postForm.cgfy" placeholder="请输入申请人"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="申请时间">
<el-input v-model="postForm.ysxm" placeholder="请输入申请时间"></el-input>
<el-input v-model="postForm.applyTime" placeholder="请输入申请时间"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
......@@ -108,7 +87,7 @@
</template>
<script>
import { personalList, submitRemark } from "@/api/smartSchool/personWork/clockRecord.js"
import { getListlb, getListxq } from "@/api/smartSchool/logisticsManage/detailsofFundusage.js"
export default {
name: 'detailsofFundusage',
......@@ -129,18 +108,28 @@ export default {
// 详情
look: false,
// 表格
postForm: [],
postForm: {},
open: false,
title: '',
rules: [],
total: 0,
// 校验规则
rules: {
},
};
},
// 目标页面的组件
created() {
const projectName = this.$route.query.projectName;
console.log(111,projectName); // 在控制台中输出 projectName 的值
},
methods: {
// 获取列表
getList() {
this.loading = true;
personalList(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
getListlb(this.queryParams).then(response => {
this.clockRecordList = response.rows;
console.log(this.clockRecordList);
this.total = response.total;
this.loading = false;
})
......@@ -158,8 +147,14 @@ export default {
},
// 详情
handleEdit(row) {
this.form = row;
this.open = true;
const id = row.id || this.ids
getListxq(id).then(response => {
this.postForm = response.data;
console.log(this.postForm);
this.total = response.total;
this.loading = false;
})
},
// 取消按钮
cancel() {
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue
<template>
<div class="app-container">
<el-form :model="queryForm" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item prop="year">
<el-form-item prop="year">
<el-date-picker v-model="queryForm.year" clearable type="year" value-format="yyyy" style="width: 100%"
placeholder="选择年度">
</el-date-picker>
......@@ -9,8 +9,7 @@
<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="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['system:assets:add']">新增 </el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增 </el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }" :data="budgetList"
......@@ -175,7 +174,6 @@ export default {
},
data() {
return {
// 查询表单
queryForm: {
budgetYear: '',// 预算年度
......@@ -201,7 +199,7 @@ export default {
xzTable: [
{},
],
options:"",
options: "",
// 查看表格
lookTable: [],
// 是否显示弹出层
......@@ -227,7 +225,7 @@ export default {
// 年
year: "",
// 预算单位名称
deptName:"",
deptName: "",
upload: {
// 是否显示弹出层（用户导入）
open: false,
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetView/index.vue
......@@ -46,8 +46,8 @@
<!-- </el-form-item>-->
<el-form-item label="政府采购" prop="isGov">
<el-select v-model="queryForm.isGov" placeholder="请选择是否为政府采购" style="width: 100%">
<el-option label="是" value="0"></el-option>
<el-option label="否" value="1"></el-option>
<el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option>
</el-select>
</el-form-item>
<el-form-item>
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/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 {getGradeOfficeDirectorList, getLeaderList} from "@/api/smartSchool/personWork/leaveApply";
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 (!this.id || Number(this.id) === NaN) {
if (!this.id || isNaN(this.id)) {
throw TypeError('级部/处室id应为非空数字类型！');
}
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;
},
/** 级部、处室主任选择 */
gradeOfficeDirector(form) {
return getGradeOfficeDirectorList(form);
},
/** 分管领导、主要领导 */
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/index.vue
......@@ -9,10 +9,12 @@
format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" placeholder="选择日期时间"
@change="changeData(queryForm.sj)">
</el-date-picker> -->
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm"
@change="changeData(queryForm.sj)"></el-date-picker>
<el-date-picker v-model="dateRange" type="datetime" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm"
@change="changeData(queryForm.sj)">
</el-date-picker>
<span v-if="week !== ''" style="font-size: 14px">({{ week }})</span>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-circle-plus" size="mini" @click="handleAdd">新增</el-button>
......@@ -161,8 +163,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="分管领导" prop="leadershipName">
<el-input :value="postForm.leadershipId" placeholder="请选择分管领导"
<el-form-item label="分管领导" prop="leadershipName" v-if="postForm.totalTime > 0.5">
<el-input :value="postForm.leadershipName" placeholder="请选择分管领导"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
</el-col>
......@@ -277,8 +279,8 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
@pagination="getList"></pagination>
<!-- 选择对应处理人 -->
<!-- <SelectUser :id="selectHandles.id" :open.sync="selectHandles.open" :title="selectHandles.title"
:width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser> -->
<SelectUser :id="selectHandles.id" :open.sync="selectHandles.open" :title="selectHandles.title"
:width="selectHandles.width" :execute="selectHandles.method" @select="selectUser"></SelectUser>
</div>
</template>
......@@ -295,10 +297,14 @@ import {
import { CustomCellStyle } from "@/enums/customStyle";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { SubmitState } from "@/enums/apply";
// import SelectUser from "./components/SelectUser";
import SelectUser from "./components/SelectUser";
export default {
name: "auditoriumReservation",
components: {
SelectUser
},
data() {
return {
week: "", // 选择的天数
......@@ -513,15 +519,135 @@ export default {
this.week = "";
this.handleQuery(); // 重新发一次请求
},
//获校领导下拉框、
schoolLeader() {
getLeaderList().then(((res) => {
if (res.code == 200) {
this.schoolLeaderList = res.rows
}
}))
},
//填充级部/处室数据到form,并且根据id获取主任列表
getGradeOfficeDirector(data) {
if (this.form.handUserName1) {
this.form.handUserName1 = ""
}
const { id, label } = data;
console.log(id, label, 758)
this.form.applyOrgname = label;
this.form.applyOrgid = id;
getGradeOfficeDirectorList(id).then(((res) => {
if (res.code == 200) {
this.gradeOfficeDirectorList = res.rows
}
}))
},
handleDirector(data) {
const { handUserName1, handUserId1 } = data;
this.form.handUserName1 = handUserName1;
this.form.handUserId1 = handUserId1;
},
handleDeputyLeader(data) {
const { handUserName2, handUserId2 } = data;
this.form.handUserName2 = handUserName2;
this.form.handUserId2 = handUserId2;
},
handleLeader(data) {
const { handUserName3, handUserId3 } = data;
this.form.handUserName3 = handUserName3;
this.form.handUserId3 = handUserId3;
},
leaveTime() {
//0代表教工，1代表职工
if (this.employeeType == 0) {
if (this.form.startTime && this.form.endTime && this.form.startSort && this.form.endSort) {
getLeaveTime({
startTime: formatDate(this.form.startTime),
endTime: formatDate(this.form.endTime),
startSort: this.form.startSort,
endSort: this.form.endSort,
applyType: this.employeeType
}).then((res) => {
if (res.code == 200) {
this.$set(this.form, 'dayCourse', res.dayCourse)
this.$set(this.form, 'totalTime', res.data)
}
})
}
} else {
if (this.form.startTime && this.form.endTime) {
getLeaveTime({
startTime: formatDate(this.form.startTime),
endTime: formatDate(this.form.endTime),
applyType: this.employeeType
}).then((res) => {
if (res.code == 200) {
this.$set(this.form, 'totalTime', res.data)
}
})
}
}
},
getFormatDate(timeDate) {
let date = new Date(timeDate);
let year = date.getFullYear();
let month = date.getMonth() + 1;
let day = date.getDate();
return [year, '-', month, '-', day].join('');
},
//获取级部/处室 主任 下拉框
gradeDirectorList() {
this.$nextTick(() => {
getGradeOfficeDirectorList(this.form.applyOrgid).then(((res) => {
if (res.code == 200) {
this.gradeOfficeDirectorList = res.rows
}
}))
})
},
formReady() {
//获取级部处室下拉框
getGradeOfficeList().then(((res) => {
this.gradeOfficeList = res.data;
})).then(() => {
getDepId().then(res => {
this.$set(this.form, "applyOrgid", res.data);
this.form.applyOrgid = res.data
let arr = this.readNodes(this.gradeOfficeList)
const node = arr.find(item => {
if (item.id == this.form.applyOrgid) {
return item
}
})
this.form.applyOrgname = node.label
//获取级部/处室 主任 下拉框
// getGradeOfficeDirectorList(this.form.applyOrgid).then(((res) => {
// if (res.code == 200) {
// this.gradeOfficeDirectorList = res.rows
// }
// }))
})
})
},
readNodes(nodes = [], arr = []) {
for (let item of nodes) {
arr.push({ id: item.id, label: item.label })
if (item.children && item.children.length) this.readNodes(item.children, arr)
}
return arr
},
// 选择处理人:打开对话框
// openSelect(title, method, type) {
// this.selectHandles.open = true;
// this.selectHandles.title = title;
// this.selectHandles.method = method;
// this.selectHandles.type = type;
// // 将级部、处室 id赋值
// this.selectHandles.id = this.form.applyOrgid;
// },
openSelect(title, method, type) {
this.selectHandles.open = true;
this.selectHandles.title = title;
this.selectHandles.method = method;
this.selectHandles.type = type;
// 将级部、处室 id赋值
this.selectHandles.id = this.form.applyOrgid;
},
// 选择处理人
selectUser(select) {
// 这种写法存在一定危险，后续最好是可以有更好的字段名对应
......@@ -529,6 +655,7 @@ export default {
this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id);
},
// 新增按钮操作
handleAdd() {
this.reset();
......
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