Skip to content

D
dd_school
Commit 2e89dded by xuwenhao
Options

Merge branch 'master' of http://49.232.152.146:6688/xhxy/smart_school

parents 6bdb2b34 a13bec33
Showing with 365 additions and 132 deletions
ruoyi-ui/src/api/smartSchool/logisticsManage/departmentBudgetview.js
import request from "@/utils/request"; import request from "@/utils/request";
//查询科室预算填报项目明细列表 //查询科室预算填报项目明细列表
export function getksBudgetList(query) { export function getksBudgetList(query) {
...@@ -15,4 +14,3 @@ export function depBudget(id) { ...@@ -15,4 +14,3 @@ export function depBudget(id) {
method: "get", method: "get",
}); });
} }
ruoyi-ui/src/api/smartSchool/officialWork/budgetFilling.js
...@@ -47,3 +47,10 @@ export function submitApply(id) { ...@@ -47,3 +47,10 @@ export function submitApply(id) {
method: "post", method: "post",
}); });
} }
// 获取登录人信息
export function departUser() {
return request({
url: "/departmentBudget/getUserXx",
method: "get",
});
}
\ No newline at end of file
ruoyi-ui/src/api/smartSchool/personWork/auditoriumReservation/index.js
...@@ -58,3 +58,10 @@ export function getLeaderList(data) { ...@@ -58,3 +58,10 @@ export function getLeaderList(data) {
params: data, params: data,
}); });
} }
// 附件上传
export function uploadList() {
return request({
url: "/common/upload",
method: "post",
});
}
\ No newline at end of file
ruoyi-ui/src/api/smartSchool/personWork/venueReservation/audreservationStatus/index.js
import request from "@/utils/request"; import request from "@/utils/request";
// 查询全部礼堂预约列表 // 查询全部礼堂预约列表
export function listAuditor(query) { export function listAuditorqb(query) {
return request({ return request({
url: "/auditorium/list", url: "/auditorium/list",
method: "get", method: "get",
......
ruoyi-ui/src/api/smartSchool/personWork/venueReservation/recordingroomManagement/index.js
...@@ -10,10 +10,11 @@ export function addStudio(data) { ...@@ -10,10 +10,11 @@ export function addStudio(data) {
} }
// 查看录播室列表 // 查看录播室列表
export function getStudio() { export function getStudio(query) {
return request({ return request({
url: "/studio/list", url: "/studio/list",
method: "get", method: "get",
params: query,
}); });
} }
......
ruoyi-ui/src/components/FileUploadNew/index.vue 0 → 100644
<template>
<div class="upload-file">
<el-upload multiple :action="uploadFileUrl" :before-upload="handleBeforeUpload" :file-list="fileList" :limit="limit"
:on-error="handleUploadError" :on-exceed="handleExceed" :on-success="handleUploadSuccess" :show-file-list="false"
:headers="headers" class="upload-file-uploader" ref="fileUpload">
<!-- 上传按钮 -->
<el-button size="mini" type="primary">流程单附件</el-button>
<!-- 上传提示 -->
<!-- <div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
<template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b> </template>
<template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b> </template>
的文件
</div> -->
</el-upload>
<!-- 文件列表 -->
<transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
<li :key="file.fjlj" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
<el-link :href="`${baseUrl}${file.fjlj}`" :underline="false" target="_blank">
<!-- <span class="el-icon-document"> {{ getFileName(file.name) }} </span> -->
<span class="el-icon-document"> {{ file.fjmc }} </span>
</el-link>
<!-- <div class="ele-upload-list__item-content-action">
<el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
</div> -->
<div class="ele-upload-list__item-content-action" style="float: right">
<el-link style="margin-left: 10px;color: #1890ff" :href="`${baseUrl}${file.fjlj}`" :underline="false"
target="_blank">下载</el-link>
<el-link style="margin-left: 15px" :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
</div>
</li>
</transition-group>
</div>
</template>
<script>
import { getToken } from "@/utils/auth";
export default {
name: "FileUploadNew",
props: {
// 值
value: [String, Object, Array],
// 数量限制
limit: {
type: Number,
default: 5,
},
// 大小限制(MB)
// fileSize: {
// type: Number,
// default: 5,
// },
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf"],
},
// 是否显示提示
isShowTip: {
type: Boolean,
default: true
}
},
data() {
return {
number: 0,
uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
headers: {
Authorization: "Bearer " + getToken(),
},
fileList: [],
};
},
watch: {
value: {
handler(val) {
if (val) {
let temp = 1;
// 首先将值转为数组
const list = Array.isArray(val) ? val : this.value.split(',');
// 然后将数组转为对象数组
this.fileList = list.map(item => {
if (typeof item === "string") {
item = { fjmc: item, fjlj: item };
}
item.uid = item.uid || new Date().getTime() + temp++;
return item;
});
} else {
this.fileList = [];
return [];
}
},
deep: true,
immediate: true
}
},
computed: {
// 是否显示提示
showTip() {
return this.isShowTip && (this.fileType || this.fileSize);
},
},
methods: {
// 上传前校检格式和大小
handleBeforeUpload(file) {
// 校检文件类型
if (this.fileType) {
let fileExtension = "";
if (file.name.lastIndexOf(".") > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
}
const isTypeOk = this.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
});
if (!isTypeOk) {
this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
return false;
}
}
// 校检文件大小
if (this.fileSize) {
const isLt = file.size / 1024 / 1024 < this.fileSize;
if (!isLt) {
this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
return false;
}
}
this.$modal.loading("正在上传文件，请稍候...");
this.number++;
return true;
},
// 文件个数超出
handleExceed() {
this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
},
// 上传失败
handleUploadError(err) {
this.$modal.msgError("上传图片失败，请重试");
this.$modal.closeLoading()
},
// 上传成功回调
handleUploadSuccess(res, file) {
console.log('res', res);
console.log('file', file);
if (res.code === 200) {
this.uploadList.push({ fjmc: file.response.originalFilename, fjlj: file.response.url });
this.uploadedSuccessfully();
} else {
this.number--;
this.$modal.closeLoading();
this.$modal.msgError(res.msg);
this.$refs.fileUpload.handleRemove(file);
this.uploadedSuccessfully();
}
},
// 删除文件
handleDelete(index) {
console.log('this.fileList', this.fileList);
this.fileList.splice(index, 1);
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
},
// 上传结束处理
uploadedSuccessfully() {
if (this.number > 0 && this.uploadList.length === this.number) {
this.fileList = this.fileList.concat(this.uploadList);
this.uploadList = [];
this.number = 0;
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
this.$modal.closeLoading();
}
},
// 获取文件名称
getFileName(name) {
if (name.lastIndexOf("/") > -1) {
return name.slice(name.lastIndexOf("/") + 1);
} else {
return "";
}
},
// 对象转成指定字符串分隔
listToString(list, separator) {
let strs = "";
separator = separator || ",";
for (let i in list) {
strs += list[i].url + separator;
}
return strs != '' ? strs.substr(0, strs.length - 1) : '';
}
}
};
</script>
<style scoped lang="scss">
.upload-file-uploader {
margin-bottom: 5px;
}
.upload-file-list .el-upload-list__item {
border: 1px solid #e4e7ed;
line-height: 2;
margin-bottom: 10px;
position: relative;
}
.upload-file-list .ele-upload-list__item-content {
display: flex;
justify-content: space-between;
align-items: center;
color: inherit;
}
.ele-upload-list__item-content-action .el-link {
margin-right: 10px;
}
</style>
ruoyi-ui/src/router/routerMenus/indexMould/index.js
...@@ -95,7 +95,7 @@ export default [ ...@@ -95,7 +95,7 @@ export default [
component: () => component: () =>
import("@/views/smartSchool/indexMould/myTask/depBudgetapproval"), import("@/views/smartSchool/indexMould/myTask/depBudgetapproval"),
name: "depBudgetapproval", name: "depBudgetapproval",
meta: { title: "科室申请请假审批" }, meta: { title: "科室预算审批" },
}, },
], ],
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auinfo.vue
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
<el-input :value="infoForm.activityNumber"></el-input> <el-input :value="infoForm.activityNumber"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否彩排"> <el-form-item label="是否彩排">
<el-input :value="infoForm.isRehearsal"></el-input> <el-input :value="displayIsRehearsal" readonly></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.isRehearsal"></el-input> <el-input :value="displayIsRecording" readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item label="是否直播"> <el-form-item label="是否直播">
<el-input :value="infoForm.isLive"></el-input> <el-input :value="displayIsLive" readonly></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请部门"> <el-form-item label="申请部门">
<el-input :value="infoForm.applyDept"></el-input> <el-input :value="infoForm.applyDept"></el-input>
...@@ -64,6 +64,19 @@ export default { ...@@ -64,6 +64,19 @@ export default {
name: "auinfo", name: "auinfo",
dicts: ['biz_leave_type', 'course_num'], dicts: ['biz_leave_type', 'course_num'],
components: { TaskResolve }, components: { TaskResolve },
computed: {
displayIsRehearsal() {
return this.infoForm.isRehearsal === 0 ? '否' : '是';
},
displayIsRecording() {
return this.infoForm.isRehearsal === 0 ? '否' : '是';
},
displayIsLive() {
return this.infoForm.isLive === 0 ? '否' : '是';
}
},
props: { props: {
id: { id: {
type: [String, Number], type: [String, Number],
...@@ -117,8 +130,11 @@ export default { ...@@ -117,8 +130,11 @@ export default {
/** 获取详情 */ /** 获取详情 */
getDetailInfo() { getDetailInfo() {
getAuditor(this.id).then(res => { getAuditor(this.id).then(res => {
this.infoForm = res.data this.infoForm = res.data;
console.log(111,this.infoForm); if (this.infoForm.isRehearsal == 1) {
}
console.log(111, this.infoForm);
}) })
}, },
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/index.vue
...@@ -22,9 +22,21 @@ ...@@ -22,9 +22,21 @@
<el-table-column label="活动地点" align="center" prop="activityArea" /> <el-table-column label="活动地点" align="center" prop="activityArea" />
<el-table-column label="负责人" align="center" prop="specificUserName" /> <el-table-column label="负责人" align="center" prop="specificUserName" />
<el-table-column label="活动人数" align="center" prop="activityNumber" /> <el-table-column label="活动人数" align="center" prop="activityNumber" />
<el-table-column prop="isRehearsal" label="是否彩排" align="center" /> <el-table-column prop="isRehearsal" label="是否彩排" align="center">
<el-table-column label="是否录像" align="center" prop="isVideo" /> <template slot-scope="{ row }">
<el-table-column label="是否直播" align="center" prop="isVideo" /> {{ row.isRehearsal == 0 ? "否" : row.isRehearsal == 1 ? "是" : "" }}
</template>
</el-table-column>
<el-table-column label="是否录像" align="center" prop="isVideo">
<template slot-scope="{ row }">
{{ row.isVideo == 0 ? "否" : row.isVideo == 1 ? "是" : "" }}
</template>
</el-table-column>
<el-table-column label="是否直播" align="center" prop="isLive">
<template slot-scope="{ row }">
{{ row.isLive == 0 ? "否" : row.isLive == 1 ? "是" : "" }}
</template>
</el-table-column>
<el-table-column label="申请部门" align="center" prop="applyDept" /> <el-table-column label="申请部门" align="center" prop="applyDept" />
<el-table-column label="申请人" align="center" prop="applyName" /> <el-table-column label="申请人" align="center" prop="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" /> <el-table-column label="申请时间" align="center" prop="applyTime" />
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/depBudgetapproval/index.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<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="year" label="年度" width="60" type="index" align="center" style="height: 20px;" /> <el-table-column prop="year" label="年度" width="60" align="center" style="height: 20px;" />
<el-table-column prop="deptName" label="科室" align="center" /> <el-table-column prop="deptName" label="科室" align="center" />
<el-table-column label="填报人" align="center" prop="informant" /> <el-table-column label="填报人" align="center" prop="informant" />
<el-table-column label="分管领导" align="center" prop="leadershipName" /> <el-table-column label="分管领导" align="center" prop="leadershipName" />
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
this.loading = true; this.loading = true;
taskDoneList().then((response) => { taskDoneList().then((response) => {
this.tableData = response.rows this.tableData = response.rows
console.log('this.tableData', this.tableData);
this.total = response.total this.total = response.total
this.loading = false this.loading = false
}); });
......
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetFillingfollows/index.vue
...@@ -63,14 +63,12 @@ ...@@ -63,14 +63,12 @@
<el-row style="margin-top: 15px;margin-left: 20px;"> <el-row style="margin-top: 15px;margin-left: 20px;">
<el-col :span="14"> <el-col :span="14">
<span class="uploadname" style="font-size: 16px;font-weight: bold;">填报人: <span class="uploadname" style="font-size: 16px;font-weight: bold;">填报人:
<!-- <img v-if="jlqztp" :src="jlqztp"> {{ form.informant }}
<span v-else>{{ jlmc }}</span> -->
</span> </span>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导: <span class="uploadname" style="font-size: 16px;font-weight: bold;">分管领导:
<!-- <img v-if="sjqztp" :src="sjqztp"> {{ form.leadershipName }}
<span v-else>{{ sjmc }}</span> -->
</span> </span>
</el-col> </el-col>
</el-row> </el-row>
...@@ -198,8 +196,10 @@ export default { ...@@ -198,8 +196,10 @@ export default {
this.lookTable = response.data.schoolDepartmentBudgetProjectmxList; this.lookTable = response.data.schoolDepartmentBudgetProjectmxList;
this.form.year = response.data.year; this.form.year = response.data.year;
this.form.deptName = response.data.deptName; this.form.deptName = response.data.deptName;
this.form.informant = response.data.informant;
this.form.leadershipName = response.data.leadershipName;
console.log(this.form.year, this.form.deptName); console.log(this.form.year, this.form.deptName);
console.log(response.data); console.log(11110, response.data);
this.openLook = true; this.openLook = true;
this.$modal.closeLoading(); this.$modal.closeLoading();
......
ruoyi-ui/src/views/smartSchool/logisticsManage/departmentBudgetview/index.vue
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
<el-form-item prop="deptName"> <el-form-item prop="deptName">
<el-input v-model="queryForm.deptName" placeholder="科室" clearable> </el-input> <el-input v-model="queryForm.deptName" placeholder="科室" clearable> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="isGov"> <el-form-item prop="isGovernmentPurchase">
<el-select v-model="queryForm.isGov" placeholder="是否政府采购" style="width: 100%"> <el-select v-model="queryForm.isGovernmentPurchase" placeholder="是否政府采购" style="width: 100%">
<el-option label="是" value="1"></el-option> <el-option label="是" value="1"></el-option>
<el-option label="否" value="0"></el-option> <el-option label="否" value="0"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/personWork/leaveApply/components/SelectUser.vue
...@@ -154,6 +154,7 @@ export default { ...@@ -154,6 +154,7 @@ export default {
}, },
/** 选项选中发生变化 */ /** 选项选中发生变化 */
selectionChange(selections) { selectionChange(selections) {
console.log('seselections', selections);
this.selectUser = selections[0]; this.selectUser = selections[0];
}, },
/** 点击选中、取消 */ /** 点击选中、取消 */
......
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/IdleSituation/index.vue
...@@ -4,8 +4,7 @@ ...@@ -4,8 +4,7 @@
<el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="showSearch"> <el-form :model="queryParams" ref="queryParams" size="small" :inline="true" v-show="showSearch">
<el-form-item label="日期" prop="startTime"> <el-form-item label="日期" prop="startTime">
<el-date-picker size="small" v-model="queryParams.startTime" type="date" placeholder="开始日期" <el-date-picker size="small" v-model="queryParams.startTime" type="date" placeholder="开始日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDate" :picker-options="pickerOptions"
format="yyyy-MM-dd" @change="changeDate" :picker-options="pickerOptions"
style="margin-right:10px"> style="margin-right:10px">
</el-date-picker> </el-date-picker>
...@@ -16,7 +15,7 @@ ...@@ -16,7 +15,7 @@
<el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]"> <el-form-item prop="studioName" :rules="[{ required: true, message: '请选择录播室', trigger: 'change,blur' }]">
<el-select v-model="queryParams.studioId" placeholder="录播室" > <el-select v-model="queryParams.studioId" placeholder="录播室">
<el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id"> <el-option v-for="item in options" :key="item.id" :label="item.studioName" :value="item.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -24,7 +23,7 @@ ...@@ -24,7 +23,7 @@
</el-form-item> </el-form-item>
<el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button> <el-button size="mini" type="primary" icon="el-icon-search" @click="fetchData">搜索</el-button>
<!-- <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> --> <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<!-- :disabled="isReservationDisabled" --> <!-- :disabled="isReservationDisabled" -->
<el-button size="mini" @click="reserve">预约</el-button> <el-button size="mini" @click="reserve">预约</el-button>
</el-form> </el-form>
...@@ -143,6 +142,17 @@ export default { ...@@ -143,6 +142,17 @@ export default {
// this.fetchData(); // this.fetchData();
}, },
methods: { methods: {
// 重置按钮
resetQuery() {
this.queryParams = {
studioId: "",
startTime: "",
pageNum: 1,
pageSize: 10,
};
this.fetchStudioUseData(); // 重新发一次请求
},
changeDate() { changeDate() {
this.endTime = moment(this.queryParams.startTime).add(9, 'days') this.endTime = moment(this.queryParams.startTime).add(9, 'days')
}, },
...@@ -161,7 +171,7 @@ export default { ...@@ -161,7 +171,7 @@ export default {
const occupiedData = this.studioUseData.find((item) => { const occupiedData = this.studioUseData.find((item) => {
// console.log('Array.from(item.useJc)',item.useJc.split(',')) // console.log('Array.from(item.useJc)',item.useJc.split(','))
// console.log('Array.from(item.useJc)',index + 1) // console.log('Array.from(item.useJc)',index + 1)
return item.useDate === day && item.useJc.split(',').includes((index+1).toString()); return item.useDate === day && item.useJc.split(',').includes((index + 1).toString());
}); });
return occupiedData ? occupiedData.useUserId : false; return occupiedData ? occupiedData.useUserId : false;
}, },
...@@ -170,7 +180,7 @@ export default { ...@@ -170,7 +180,7 @@ export default {
if (this.isOccupied(day, index)) { if (this.isOccupied(day, index)) {
return false return false
} else { } else {
console.log('this.selectedTimeSlots',this.selectedTimeSlots) console.log('this.selectedTimeSlots', this.selectedTimeSlots)
// 检查时间段是否已选中 // 检查时间段是否已选中
return this.selectedTimeSlots.some((selectedSlot) => { return this.selectedTimeSlots.some((selectedSlot) => {
// console.log('selectedSlot',selectedSlot) // console.log('selectedSlot',selectedSlot)
...@@ -190,7 +200,7 @@ export default { ...@@ -190,7 +200,7 @@ export default {
return return
} else if (this.selectedTimeSlots.length == 0) { } else if (this.selectedTimeSlots.length == 0) {
// 处理单元格点击事件，点击第一个 // 处理单元格点击事件，点击第一个
this.selectedTimeSlots.push({day, index}) this.selectedTimeSlots.push({ day, index })
this.remark = true this.remark = true
//没有选同一天 //没有选同一天
} else if (this.selectedTimeSlots[0].day != day) { } else if (this.selectedTimeSlots[0].day != day) {
...@@ -211,7 +221,7 @@ export default { ...@@ -211,7 +221,7 @@ export default {
this.selectedTimeSlots = this.selectedTimeSlots.filter(item => item.index != index) this.selectedTimeSlots = this.selectedTimeSlots.filter(item => item.index != index)
this.selectedTimeSlots.length == 0 ? this.remark = false : this.selectedTimeSlots this.selectedTimeSlots.length == 0 ? this.remark = false : this.selectedTimeSlots
} else { } else {
this.selectedTimeSlots.push({day, index}) this.selectedTimeSlots.push({ day, index })
} }
} }
}, },
...@@ -220,7 +230,7 @@ export default { ...@@ -220,7 +230,7 @@ export default {
getRoomList() { getRoomList() {
getAppointmentList({}).then((res) => { getAppointmentList({}).then((res) => {
this.options = res.rows; this.options = res.rows;
console.log('res',res) console.log('res', res)
}); });
}, },
...@@ -272,13 +282,13 @@ export default { ...@@ -272,13 +282,13 @@ export default {
handleMouseDown(day, index) { handleMouseDown(day, index) {
// 处理鼠标按下事件 // 处理鼠标按下事件
this.isMouseDown = true; this.isMouseDown = true;
this.startSelection = {day, index}; this.startSelection = { day, index };
this.endSelection = {day, index}; this.endSelection = { day, index };
}, },
handleMouseUp(day, index) { handleMouseUp(day, index) {
// 处理鼠标松开事件 // 处理鼠标松开事件
this.isMouseDown = false; this.isMouseDown = false;
this.endSelection = {day, index}; this.endSelection = { day, index };
// 根据按下的键盘按键进行选择操作 // 根据按下的键盘按键进行选择操作
if (event.ctrlKey) { if (event.ctrlKey) {
...@@ -296,7 +306,7 @@ export default { ...@@ -296,7 +306,7 @@ export default {
handleMouseEnter(day, index) { handleMouseEnter(day, index) {
// 处理鼠标进入单元格事件（用于 Shift 键多选） // 处理鼠标进入单元格事件（用于 Shift 键多选）
if (this.isMouseDown && event.shiftKey) { if (this.isMouseDown && event.shiftKey) {
this.endSelection = {day, index}; this.endSelection = { day, index };
this.selectMultipleSlots(); this.selectMultipleSlots();
} }
}, },
...@@ -321,22 +331,22 @@ export default { ...@@ -321,22 +331,22 @@ export default {
dayIndex === this.days.indexOf(endDay) dayIndex === this.days.indexOf(endDay)
) { ) {
for (let index = startIndex; index <= endIndex; index++) { for (let index = startIndex; index <= endIndex; index++) {
selectedTimeSlots.push({day, index}); selectedTimeSlots.push({ day, index });
} }
} else if (dayIndex === this.days.indexOf(startDay)) { } else if (dayIndex === this.days.indexOf(startDay)) {
// 对于起始日期，选择从起始索引到最后一个时间段 // 对于起始日期，选择从起始索引到最后一个时间段
for (let index = startIndex; index < this.timeSlots.length; index++) { for (let index = startIndex; index < this.timeSlots.length; index++) {
selectedTimeSlots.push({day, index}); selectedTimeSlots.push({ day, index });
} }
} else if (dayIndex === this.days.indexOf(endDay)) { } else if (dayIndex === this.days.indexOf(endDay)) {
// 对于结束日期，选择从第一个时间段到结束索引 // 对于结束日期，选择从第一个时间段到结束索引
for (let index = 0; index <= endIndex; index++) { for (let index = 0; index <= endIndex; index++) {
selectedTimeSlots.push({day, index}); selectedTimeSlots.push({ day, index });
} }
} else { } else {
// 其他日期完全选择 // 其他日期完全选择
for (let index = 0; index < this.timeSlots.length; index++) { for (let index = 0; index < this.timeSlots.length; index++) {
selectedTimeSlots.push({day, index}); selectedTimeSlots.push({ day, index });
} }
} }
} }
...@@ -368,13 +378,13 @@ export default { ...@@ -368,13 +378,13 @@ export default {
//弹窗 //弹窗
reserve(day, index) { reserve(day, index) {
if (this.remark) { if (this.remark) {
if(this.queryParams.studioId == ''){ if (this.queryParams.studioId == '') {
this.successDialogVisible = false; this.successDialogVisible = false;
this.$modal.alertWarning("请选择录播室"); this.$modal.alertWarning("请选择录播室");
}else{ } else {
this.successDialogVisible = true; this.successDialogVisible = true;
} }
} else{ } else {
console.log(this.remark) console.log(this.remark)
this.successDialogVisible = false; this.successDialogVisible = false;
} }
...@@ -393,27 +403,27 @@ export default { ...@@ -393,27 +403,27 @@ export default {
// 在这里，你可以处理预约操作，例如发送请求进行录播室预约操作 // 在这里，你可以处理预约操作，例如发送请求进行录播室预约操作
// 预约成功后，你可以根据已选时间段的数据来更新录播室的占用情况 // 预约成功后，你可以根据已选时间段的数据来更新录播室的占用情况
this.successDialogVisible = false; this.successDialogVisible = false;
console.log('queryParams.studioName',this.queryParams) console.log('queryParams.studioName', this.queryParams)
console.log('this.selectedTimeSlots',this.selectedTimeSlots) console.log('this.selectedTimeSlots', this.selectedTimeSlots)
console.log('form.studioContent',this.form.studioContent) console.log('form.studioContent', this.form.studioContent)
const jc = this.selectedTimeSlots.map(item => { const jc = this.selectedTimeSlots.map(item => {
return item.index+1 return item.index + 1
}) })
const stringJC = jc.toString() const stringJC = jc.toString()
console.log('stringJC',stringJC) console.log('stringJC', stringJC)
const params = { const params = {
//录播室id //录播室id
studioId:this.queryParams.studioId, studioId: this.queryParams.studioId,
//预约时间 //预约时间
appointmentTime:this.selectedTimeSlots[0].day, appointmentTime: this.selectedTimeSlots[0].day,
//预约节次 //预约节次
appointmentJc:stringJC, appointmentJc: stringJC,
//录播内容 //录播内容
studioContent:this.form.studioContent studioContent: this.form.studioContent
} }
addIdle(params).then(res => { addIdle(params).then(res => {
console.log('res',res) console.log('res', res)
if(res.code == 200){ if (res.code == 200) {
this.$message({ this.$message({
message: "预约成功", message: "预约成功",
type: "success", type: "success",
...@@ -480,5 +490,4 @@ th { ...@@ -480,5 +490,4 @@ th {
background-color: #66b3ff; background-color: #66b3ff;
} }
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/myAppointment/index.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<td>申请时间</td> <td>申请时间</td>
<td>{{ applyTime }}</td> <td>{{ applyTime }}</td>
<td>状态</td> <td>状态</td>
<td class="btntext" colspan="5">{{ statu }}</td> <td class="btntext" colspan="5">{{ statu === '1' ? '预约成功' : '取消' }}</td>
</tr> </tr>
</table> </table>
</div> </div>
......
ruoyi-ui/src/views/smartSchool/venueReservation/audreservationStatus/index.vue
...@@ -4,13 +4,11 @@ ...@@ -4,13 +4,11 @@
<el-form-item prop="activityName"> <el-form-item prop="activityName">
<el-input v-model="queryForm.activityName" @keyup.enter.native="handleQuery" placeholder="活动名称"></el-input> <el-input v-model="queryForm.activityName" @keyup.enter.native="handleQuery" placeholder="活动名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item prop="dateRange">
<el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="开始日期" <el-date-picker v-model="dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
value-format="yyyy-MM-dd HH:mm" end-placeholder="结束日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
@change="changeData(queryForm.sj)"></el-date-picker> </el-date-picker>
<span v-if="week !== ''" style="font-size: 14px">({{ week }})</span>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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 icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
...@@ -49,8 +47,8 @@ ...@@ -49,8 +47,8 @@
</el-table-column> </el-table-column>
<el-table-column label="申请人" align="center" prop="applyName" /> <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 :width="queryForm.submitState ? 100 : 250" label="操作" align="center" v-if="columns[12].visible" <el-table-column :width="queryForm.submitState ? 100 : 250" label="操作" align="center" fixed="right"
fixed="right" class-name="small-padding fixed-width"> class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- v-if="queryForm.submitState" --> <!-- v-if="queryForm.submitState" -->
<div> <div>
...@@ -162,7 +160,7 @@ ...@@ -162,7 +160,7 @@
<script> <script>
import { import {
listAuditor, listAuditorqb,
getAuditor, getAuditor,
} from "@/api/smartSchool/personWork/venueReservation/audreservationStatus"; } from "@/api/smartSchool/personWork/venueReservation/audreservationStatus";
...@@ -199,7 +197,8 @@ export default { ...@@ -199,7 +197,8 @@ export default {
}; };
return { return {
week: "", // 选择的天数 week: "", // 选择的天数
dateRange: [], // 用于存储选定的时间段 // 日期范围
dateRange: [],
// 单选框 // 单选框
radio1: 3, radio1: 3,
radio2: 3, radio2: 3,
...@@ -213,35 +212,12 @@ export default { ...@@ -213,35 +212,12 @@ export default {
activeName: SubmitState.WILL_SUBMIT, activeName: SubmitState.WILL_SUBMIT,
// 查询表单 // 查询表单
queryForm: { queryForm: {
submitState: 0, activityName: "",
dateRange: [], // 选择的开始日期和结束日期
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
title: '',//标题 sj: '',
type: '',//类型 state: "",
vehicleId: '',//车辆id
applicantId: '',//申请人id
applicantName: '',//用车人姓名
departmentId: undefined,//用车部门id
reason: '',//用车原因
peopleNumber: '',//人数
departurePlace: '',//出发地点
destination: '',//目的地
startTime: '',//用车开始时间
endTime: '',//用车结束时间
driver: '',//司机
vehicleType: '',//用车类型
remarks: '',//备注
kilometers: '',//公里数
state: '',//状态
instanceId: '',//流程实例id
// applyUser: '',//创建人
applyTime: '',//申请时间
taskName: '',//任务名称
comment: '',//批注
assignee: '',//
assigneeName: '',//办理人
realityStartTime: '',//实际开始时间
realityEndTime: '',//实际结束时间
}, },
// 审批历史表单 // 审批历史表单
historyForm: { historyForm: {
...@@ -305,30 +281,7 @@ export default { ...@@ -305,30 +281,7 @@ export default {
title: '', title: '',
// 列表信息 // 列表信息
columns: [ columns: [
{ key: 0, label: `流程实例ID`, visible: true },
{ key: 1, label: `申请人`, visible: true },
{ key: 2, label: `人数`, visible: true },
{ key: 3, label: `出发地点`, visible: true },
{ key: 4, label: `目的地`, visible: true },
{ key: 5, label: `用车开始时间`, visible: true },
{ key: 6, label: `用车结束时间`, visible: true },
{ key: 7, label: `司机`, visible: true },
{ key: 8, label: `用车类型`, visible: true },
{ key: 9, label: `用车原因`, visible: true },
{ key: 10, label: `申请时间`, visible: true },
{ key: 11, label: `备注`, visible: true },
{ key: 12, label: `公里数`, visible: true },
{ key: 13, label: `操作`, visible: true },
{ key: 14, label: `车牌号`, visible: true },
{ key: 15, label: `车辆类型`, visible: true },
{ key: 16, label: `车辆状态`, visible: true },
{ key: 17, label: `任务名称`, visible: true },
{ key: 18, label: `处理人ID`, visible: true },
{ key: 19, label: `处理人`, visible: true },
{ key: 20, label: `审批意见`, visible: true },
{ key: 21, label: `开始时间`, visible: true },
{ key: 22, label: `结束时间`, visible: true },
{ key: 23, label: `耗时`, visible: true },
], ],
// 活动名称 // 活动名称
...@@ -396,12 +349,21 @@ export default { ...@@ -396,12 +349,21 @@ export default {
}, },
methods: { methods: {
/** 获取列表数据 */ /** 获取列表数据 */
getList() { getList() {
listAuditor(this.addDateRange(this.queryForm, this.dateRange)).then(response => { const params = {
activityName: this.queryForm.activityName,
pageNum: this.queryForm.pageNum,
pageSize: this.queryForm.pageSize,
startTime: this.dateRange[0],
endTime: this.dateRange[1],
};
console.log(123, params);
listAuditorqb(params).then(response => {
this.loading = false; this.loading = false;
this.infoList = response.rows; this.infoList = response.rows;
console.log(111); console.log(111, response.rows);
this.total = response.total; this.total = response.total;
}).catch(err => { }).catch(err => {
this.loading = false; this.loading = false;
......
ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" /> -->
<!-- 新增/修改弹窗 --> <!-- 新增/修改弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="1200px"> <el-dialog :title="title" :visible.sync="open" width="1200px">
<el-form ref="form" :model="form" label-width="114px" :rules="rules"> <el-form ref="form" :model="form" label-width="114px" :rules="rules">
...@@ -90,16 +90,6 @@ export default { ...@@ -90,16 +90,6 @@ export default {
return { return {
studioStatu: "", studioStatu: "",
queryParams: { queryParams: {
id: "",
studioName: "",
studioStatu: "",
studioArea: "",
pageNum: 1,
pageSize: 10,
},
queryForm: {
studioName: "",
studioStatu: "",
studioArea: "", studioArea: "",
}, },
title: "", title: "",
...@@ -130,7 +120,6 @@ export default { ...@@ -130,7 +120,6 @@ export default {
methods: { methods: {
/** 查询 */ /** 查询 */
getList() { getList() {
this.loading = true;
getStudio(this.queryParams).then((response) => { getStudio(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
this.loading = false; this.loading = false;
......
ruoyi-ui/vue.config.js
...@@ -45,8 +45,8 @@ module.exports = { ...@@ -45,8 +45,8 @@ module.exports = {
//target: `http://47.105.176.202:8137`, //target: `http://47.105.176.202:8137`,
//学校内网 //学校内网
// target: `http://10.20.100.201:57321`, // target: `http://10.20.100.201:57321`,
// target: `http://192.168.1.121:8848`,
target: `http://192.168.1.116:8848`, target: `http://192.168.1.116:8848`,
// target: `http://192.168.1.116:8848`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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