Skip to content

D
dd_school
Commit fa77cae1 by zhaopanyu
Options

zpy 7.21

parent a0077cde
Showing with 110 additions and 22 deletions
ruoyi-ui/src/components/FileUploadNew/index.vue
......@@ -22,9 +22,15 @@
<span class="el-icon-document"> {{ file.fjmc }} </span>
</el-link>
<div class="ele-upload-list__item-content-action">
<!-- <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>
......@@ -163,6 +169,7 @@ export default {
this.fileList.splice(index, 1);
// this.$emit("input", this.listToString(this.fileList));
this.$emit("input", this.fileList);
},
// 上传结束处理
uploadedSuccessfully() {
......
ruoyi-ui/src/router/routerMenus/indexMould/index.js
......@@ -95,7 +95,7 @@ export default [
component: () =>
import("@/views/smartSchool/indexMould/myTask/depBudgetapproval"),
name: "depBudgetapproval",
meta: { title: "科室申请请假审批" },
meta: { title: "科室预算审批" },
},
],
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/components/auinfo.vue
......@@ -20,17 +20,17 @@
<el-input :value="infoForm.activityNumber"></el-input>
</el-form-item>
<el-form-item label="是否彩排">
<el-input :value="infoForm.isRehearsal"></el-input>
<el-input :value="displayIsRehearsal" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否录像">
<el-input :value="infoForm.isRehearsal"></el-input>
<el-input :value="displayIsRecording" readonly></el-input>
</el-form-item>
<el-form-item label="是否直播">
<el-input :value="infoForm.isLive"></el-input>
<el-input :value="displayIsLive" readonly></el-input>
</el-form-item>
<el-form-item label="申请部门">
<el-input :value="infoForm.applyDept"></el-input>
......@@ -54,9 +54,9 @@
<script>
import {
getAuditor,// 查看详情
} from "@/api/smartSchool/personWork/auditoriumReservation";
import TaskResolve from "@/views/smartSchool/indexMould/myTask/audApplicationapproval/components/autaskResolve.vue"
......@@ -64,6 +64,19 @@ export default {
name: "auinfo",
dicts: ['biz_leave_type', 'course_num'],
components: { TaskResolve },
computed: {
displayIsRehearsal() {
return this.infoForm.isRehearsal === 0 ? '否' : '是';
},
displayIsRecording() {
return this.infoForm.isRehearsal === 0 ? '否' : '是';
},
displayIsLive() {
return this.infoForm.isLive === 0 ? '否' : '是';
}
},
props: {
id: {
type: [String, Number],
......@@ -117,8 +130,11 @@ export default {
/** 获取详情 */
getDetailInfo() {
getAuditor(this.id).then(res => {
this.infoForm = res.data
console.log(111,this.infoForm);
this.infoForm = res.data;
if (this.infoForm.isRehearsal == 1) {
}
console.log(111, this.infoForm);
})
},
......
ruoyi-ui/src/views/smartSchool/indexMould/myTask/audApplicationapproval/index.vue
......@@ -22,9 +22,21 @@
<el-table-column label="活动地点" align="center" prop="activityArea" />
<el-table-column label="负责人" align="center" prop="specificUserName" />
<el-table-column label="活动人数" align="center" prop="activityNumber" />
<el-table-column prop="isRehearsal" label="是否彩排" align="center" />
<el-table-column label="是否录像" align="center" prop="isVideo" />
<el-table-column label="是否直播" align="center" prop="isVideo" />
<el-table-column prop="isRehearsal" label="是否彩排" align="center">
<template slot-scope="{ row }">
{{ 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="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" />
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
......@@ -95,7 +95,7 @@
<el-col :span="8">
<el-form-item label="活动时间" prop="activityTime" style="width: 276.66px">
<el-date-picker v-model="postForm.activityTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期">
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" :picker-options="pickerOptions">
</el-date-picker>
</el-form-item>
</el-col>
......@@ -168,7 +168,7 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="文件上传" prop="url">
<el-form-item label="流程单附件" prop="url">
<!-- <el-upload class="upload-demo" ref="upload" action="#" :auto-upload="true"
:before-upload="beforeUpload" :on-change="fileChange" :http-request="uploadFile"
:on-remove="handleRemoveFile" :file-list="fileList">
......@@ -246,10 +246,20 @@
<tr>
<td rowspan="2" class="btntxt">附件</td>
<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">
{{ item.fjmc }}
</el-link>
</p> -->
<p>
<el-link :underline="false" :href="postForm.fjlj" type="primary" target="_blank">
{{ postForm.fjmc }}
</el-link>
<!-- <el-button type="primary" size="mini" @click="downloadFile(postForm.fjlj)">
下载
</el-button> -->
</p>
</td>
</tr>
......@@ -270,7 +280,7 @@
</el-col>
<el-col :span="8">
<span class="uploadname" style="font-size: 16px; font-weight: bold">学校分管领导：
{{ leadershipName }}
{{ leadershipName }}&nbsp; {{ displayState }}
</span>
</el-col>
</el-row>
......@@ -310,7 +320,8 @@ import { SubmitState } from "@/enums/apply";
import SelectUser from "./components/SelectUser";
import moment from 'moment'
import FileUploadNew from '@/components/FileUploadNew';
import { downLoadFile } from "@/utils/utilLibrary/downloadFile";
import 'moment/locale/zh-cn';
export default {
name: "auditoriumReservation",
components: {
......@@ -318,8 +329,10 @@ export default {
FileUploadNew
},
data() {
return {
stateTexts: ['未提交', '审核中', '审核通过', '审核不通过'],
// 上传
upload: {
isUploading: false,
......@@ -360,6 +373,8 @@ export default {
htNumber: "",
// 附件名称
fjmc: "",
// 附件路径
fjlj: "",
// 申请人
applyName: "",
//申请部门
......@@ -425,6 +440,13 @@ export default {
leadershipName: "",
},
pickerOptions: {
disabledDate(time) {
const today = moment().startOf('day');
return moment(time).isBefore(today);
}
},
// 分管领导id
leadershipId: '',
// 审批人
......@@ -507,6 +529,11 @@ export default {
columns: [],
};
},
computed: {
displayState() {
return this.stateTexts[this.state] || '';
}
},
created() {
this.getList();
const rules = JSON.parse('[{ "required": true, "message": "请选择分管领导" }]');
......@@ -516,6 +543,10 @@ export default {
},
methods: {
downloadFile(url) {
// 在这里编写下载文件的逻辑，可以使用浏览器的下载功能或者自定义的下载方法
window.open(url, "_blank");
},
// changeData(dateRange) {
// if (Array.isArray(dateRange) && dateRange.length === 2) {
// this.queryForm.sj = dateRange; // 更新日期范围选择器的值
......@@ -527,6 +558,22 @@ export default {
// }
// },
getDisplayState(state) {
switch (state) {
case 0:
return '未提交';
case 1:
return '审核中';
case 2:
return '审核通过';
case 3:
return '审核不通过';
default:
return '';
}
},
handleUploadClick() {
// 触发文件上传的点击事件
this.$refs.upload.$el.querySelector('.el-upload__input').click();
......@@ -536,8 +583,10 @@ export default {
console.log('data', data);
this.fileList = data;
this.postForm.fjlj = data[0].fjlj;
console.log('this.postForm.fjlj', this.postForm.fjlj);
this.postForm.fjmc = data[0].fjmc;
console.log('this.postForm', this.postForm);
},
......@@ -637,8 +686,10 @@ export default {
this.applyName = response.data.applyName;
this.applyDept = response.data.applyDept;
this.leadershipName = response.data.leadershipName;
this.fjmc = response.data.fjmc;
console.log(response.data.state);
this.postForm.fjmc = response.data.fjmc; // 将 fjmc 存储在 postForm 中
this.postForm.fjlj = response.data.fjlj; // 将 fjlj 存储在 postForm 中
console.log('this.fjmc', this.fjmc);
this.state = response.data.state;
this.loading = false;
this.look = true;
});
......@@ -868,14 +919,16 @@ export default {
isLive: "",
isBigScreen: "",
htNumber: "",
fjmc: "",
fjmc: null, // 设置为null
fjlj: null, // 设置为null
leadershipId: "",
pageNum: 1,
pageSize: 10,
leadershipName: ""
leadershipName: "",
};
this.resetForm("postForm");
},
/** 下载 */
handleDownLoad({ url, name, id }) {
if (isString(url) && url.lastIndexOf("/") > -1) {
......
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