Skip to content

D
dd_school
Commit a13bec33 by zhaopanyu
Options

zpy 7.21

parent 8e736907
Showing with 43 additions and 38 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/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/personWork/auditoriumReservation/index.vue
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<!-- 表格信息 --> <!-- 表格信息 -->
<el-table stripe ref="applyTable" v-loading="loading" :data="infoList" :cell-style="cellStyle"> <el-table stripe ref="applyTable" v-loading="loading" :data="infoList" :cell-style="cellStyle">
<el-table-column type="index" label="序号" width="55" align="center" fixed="left"></el-table-column> <el-table-column type="index" label="序号" width="55" align="center" fixed="left"></el-table-column>
<el-table-column label="活动名称" align="center" prop="activityName" width="100px" fixed="left"/> <el-table-column label="活动名称" align="center" prop="activityName" width="100px" fixed="left" />
<el-table-column label="活动地点" align="center" width="120px" prop="activityArea" /> <el-table-column label="活动地点" align="center" width="120px" 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" />
...@@ -244,12 +244,12 @@ ...@@ -244,12 +244,12 @@
<tr> <tr>
<td rowspan="2" class="btntxt">附件</td> <td rowspan="2" class="btntxt">附件</td>
<td colspan="6"> <td colspan="6">
<p v-for="(item, index) in fileList" :key="index"> <!-- <p v-for="(item, index) in fileList" :key="index">
<el-link :underline="false" :href="item.fjlj" type="primary" target="_blank"> <el-link :underline="false" :href="item.fjlj" type="primary" target="_blank">
{{ item.fjmc }} {{ item.fjmc }}
</el-link> </el-link>
</p> --> </p> -->
<p> <p>
<el-link :underline="false" :href="postForm.fjlj" type="primary" target="_blank"> <el-link :underline="false" :href="postForm.fjlj" type="primary" target="_blank">
{{ postForm.fjmc }} {{ postForm.fjmc }}
...@@ -577,10 +577,16 @@ export default { ...@@ -577,10 +577,16 @@ export default {
getFileList(data) { getFileList(data) {
console.log('data', data); console.log('data', data);
this.fileList = data; this.fileList = data;
this.postForm.fjlj = data[0].fjlj; if (this.fileList.length != 0) {
this.postForm.fjmc = data[0].fjmc; this.postForm.fjlj = data[0].fjlj;
console.log('this.postForm', this.postForm); this.postForm.fjmc = data[0].fjmc;
console.log('this.postForm', this.postForm);
} else {
this.postForm.fjlj = '';
this.postForm.fjmc = '';
}
}, },
/** 获取列表数据 */ /** 获取列表数据 */
...@@ -737,12 +743,13 @@ export default { ...@@ -737,12 +743,13 @@ export default {
// 重置按钮 // 重置按钮
resetQuery() { resetQuery() {
const state = this.queryForm.state; const state = this.queryForm.state;
this.dateRange = []; // 重置日期选择器
this.diffDate = ''; // 重置 diffDate 为默认值
this.queryForm = { this.queryForm = {
state: state, state: state,
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}; };
this.dateRange = [];
this.week = ""; this.week = "";
this.handleQuery(); // 重新发一次请求 this.handleQuery(); // 重新发一次请求
}, },
...@@ -789,11 +796,11 @@ export default { ...@@ -789,11 +796,11 @@ export default {
// 新增按钮操作 // 新增按钮操作
handleAdd() { handleAdd() {
this.reset(); this.reset();
// const userId = this.$store.state.user.userId; // const userId = this.$store.state.user.userId;
this.postForm.activityArea = "博远礼堂"; this.postForm.activityArea = "博远礼堂";
// this.postForm.specificUserName = this.$store.state.user.name; // this.postForm.specificUserName = this.$store.state.user.name;
this.postForm.fjlj = '';
this.postForm.fjmc = '';
this.isShow = true; this.isShow = true;
this.isDisabled = false; this.isDisabled = false;
this.open = true; this.open = true;
...@@ -809,14 +816,14 @@ export default { ...@@ -809,14 +816,14 @@ export default {
getAuditor(id).then(response => { getAuditor(id).then(response => {
this.postForm = response.data; this.postForm = response.data;
console.log('this.fileList', this.fileList) console.log('this.fileList', this.fileList)
if(this.postForm.fjlj == '' || this.postForm.fjlj == undefined || this.postForm.fjlj == null){ if (this.postForm.fjlj == '' || this.postForm.fjlj == undefined || this.postForm.fjlj == null) {
this.fileList = [] this.fileList = []
}else{ } else {
this.fileList = [{ this.fileList = [{
fjlj: this.postForm.fjlj, fjlj: this.postForm.fjlj,
fjmc: this.postForm.fjmc, fjmc: this.postForm.fjmc,
}] }]
} }
console.log('postForm', this.postForm); console.log('postForm', this.postForm);
...@@ -861,21 +868,21 @@ export default { ...@@ -861,21 +868,21 @@ export default {
console.log('this.postForm', this.postForm); console.log('this.postForm', this.postForm);
// this.$modal.loading("正在上传数据，请稍等..."); // this.$modal.loading("正在上传数据，请稍等...");
if (this.postForm.id != null) { if (this.postForm.id != null) {
if(this.fileList.length != 0){ if (this.fileList.length != 0) {
// 查看表单 // 查看表单
updateAuditor(this.postForm) updateAuditor(this.postForm)
.then((response) => { .then((response) => {
this.$modal.closeLoading(); this.$modal.closeLoading();
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}) })
.catch((err) => { .catch((err) => {
this.$modal.closeLoading(); this.$modal.closeLoading();
}); });
}else{ } else {
this.$modal.msgError("流程单附件不能为空"); this.$modal.msgError("流程单附件不能为空");
} }
} else { } else {
if (this.fileList.length != 0) { if (this.fileList.length != 0) {
...@@ -923,8 +930,8 @@ export default { ...@@ -923,8 +930,8 @@ export default {
isLive: "", isLive: "",
isBigScreen: "", isBigScreen: "",
htNumber: "", htNumber: "",
fjmc: null, // 设置为null // fjmc: null,
fjlj: null, // 设置为null // fjlj: null,
leadershipId: "", leadershipId: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
......
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