Skip to content

D
dd_school
Commit 8e736907 by zhaopanyu
Options

zpy 7.21

parents fa77cae1 454ae17c
Showing with 36 additions and 32 deletions
ruoyi-ui/src/components/FileUploadNew/index.vue
......@@ -4,7 +4,7 @@
: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>
<el-button size="mini" type="primary">流程单附件</el-button>
<!-- 上传提示 -->
<!-- <div class="el-upload__tip" slot="tip" v-if="showTip">
请上传
......@@ -50,10 +50,10 @@ export default {
default: 5,
},
// 大小限制(MB)
fileSize: {
type: Number,
default: 5,
},
// fileSize: {
// type: Number,
// default: 5,
// },
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
......@@ -19,8 +19,8 @@
</el-form>
<!-- 表格信息 -->
<el-table stripe ref="applyTable" v-loading="loading" :data="infoList" :cell-style="cellStyle">
<el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
<el-table-column label="活动名称" align="center" prop="activityName" />
<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" width="120px" prop="activityArea" />
<el-table-column label="负责人" align="center" prop="specificUserName" />
<el-table-column label="活动人数" align="center" prop="activityNumber" />
......@@ -48,7 +48,7 @@
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyName" />
<el-table-column label="申请时间" align="center" prop="applyTime" />
<el-table-column label="申请时间" width="200px" align="center" prop="applyTime" />
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<div v-if="scope.row.state === '0'">
......@@ -161,10 +161,8 @@
<el-form-item label="分管领导" prop="leadershipName">
<el-input :value="postForm.leadershipName" placeholder="请选择分管领导"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
......@@ -246,7 +244,7 @@
<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>
......@@ -437,7 +435,6 @@ export default {
fjmc: "",
fjlj: "",
leadershipId: "",
leadershipName: "",
},
pickerOptions: {
......@@ -483,7 +480,6 @@ export default {
{ required: true, message: "活动场地不能为空", trigger: "blur" }
],
specificUserName: [
{ required: true, message: "具体负责人不能为空", trigger: "blur" }
],
......@@ -511,9 +507,9 @@ export default {
{ required: true, message: "是否需要大屏不能为空", trigger: "blur" }
],
leadershipName: [
{ required: true, message: "分管领导不能为空", trigger: "change" }
],
// leadershipName: [
// { required: true, message: "分管领导不能为空", trigger: "change" }
// ],
fjmc: [
{ required: true, message: "流程单附件不能为空", trigger: "blur" }
......@@ -536,7 +532,6 @@ export default {
},
created() {
this.getList();
const rules = JSON.parse('[{ "required": true, "message": "请选择分管领导" }]');
......@@ -583,11 +578,9 @@ 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);
},
/** 获取列表数据 */
......@@ -755,6 +748,15 @@ export default {
},
// 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('');
// },
readNodes(nodes = [], arr = []) {
for (let item of nodes) {
......@@ -770,20 +772,16 @@ export default {
this.selectHandles.title = title;
this.selectHandles.method = method;
this.selectHandles.type = type;
console.log('this.selectHandles', this.selectHandles);
},
// 选择处理人
selectUser(select) {
console.log('select', select);
console.log('this.postForm', this.postForm);
// 这种写法存在一定危险，后续最好是可以有更好的字段名对应
// this.$set(this.postForm, leadershipName, select.name);
// this.$set(this.postForm, leadershipId, select.id);
this.$set(this.form, `handUserName${this.selectHandles.type}`, select.name);
this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id);
this.postForm.leadershipName = select.name;
this.postForm.leadershipId = select.id;
console.log('this.postForm', this.postForm);
},
......@@ -810,15 +808,16 @@ export default {
console.log('this.fileList', this.fileList);
getAuditor(id).then(response => {
this.postForm = response.data;
console.log('this.fileList', this.fileList);
// if (this.fileList.length == 0) {
// this.fileList = []
// } else {
console.log('this.fileList', this.fileList)
if(this.postForm.fjlj == '' || this.postForm.fjlj == undefined || this.postForm.fjlj == null){
this.fileList = []
}else{
this.fileList = [{
fjlj: this.postForm.fjlj,
fjmc: this.postForm.fjmc,
}]
// }
}
console.log('postForm', this.postForm);
this.postForm.leadershipName = response.data.leadershipName
......@@ -862,6 +861,7 @@ export default {
console.log('this.postForm', this.postForm);
// this.$modal.loading("正在上传数据，请稍等...");
if (this.postForm.id != null) {
if(this.fileList.length != 0){
// 查看表单
updateAuditor(this.postForm)
.then((response) => {
......@@ -873,6 +873,10 @@ export default {
.catch((err) => {
this.$modal.closeLoading();
});
}else{
this.$modal.msgError("流程单附件不能为空");
}
} else {
if (this.fileList.length != 0) {
console.log('this.postForm', this.postForm);
......@@ -924,7 +928,7 @@ export default {
leadershipId: "",
pageNum: 1,
pageSize: 10,
leadershipName: "",
leadershipName: ""
};
this.resetForm("postForm");
},
......
ruoyi-ui/vue.config.js
......@@ -45,8 +45,8 @@ module.exports = {
//target: `http://47.105.176.202:8137`,
//学校内网
// 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`,
changeOrigin: true,
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