Skip to content

D
dd_school
Commit b6519e1c by zhaopanyu
Options

zpy 8.1

parent f7e67489
Showing with 283 additions and 65 deletions
ruoyi-ui/src/components/FileUploadNew/index.vue
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
// 文件类型, 例如['png', 'jpg', 'jpeg'] // 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: { fileType: {
type: Array, type: Array,
default: () => ["doc", "xls", "ppt", "txt", "pdf"], default: () => ["doc", "xls", "ppt", "txt", "pdf", 'png', 'jpg', 'jpeg'],
}, },
// 是否显示提示 // 是否显示提示
isShowTip: { isShowTip: {
......
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/artisticView/index.vue 0 → 100644
<template>
<div>
<h2>艺体选课情况</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/courseSelectionsituation/index.vue 0 → 100644
<template>
<div>
<h2>选课情况</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue 0 → 100644
<template>
<div>
<h2>成绩管理</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/secondaryDivision/index.vue 0 → 100644
<template>
<div>
<h2>二次分班</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/springView/index.vue 0 → 100644
<template>
<div>
<h2>春季查看</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/summerViewing/index.vue 0 → 100644
<template>
<div>
<h2>夏季查看</h2>
</div>
</template>
<script>
export default {
}
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/taskPublishing/index.vue 0 → 100644
<template>
<div>
<h2>任务发布</h2>
</div>
</template>
<script setup>
</script>
<style lang="scss" scoped></style>
\ No newline at end of file
ruoyi-ui/src/views/smartSchool/logisticsManage/budgetApproval/index.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
style="width: 200px" placeholder="请选择科室" /> style="width: 200px" placeholder="请选择科室" />
</el-form-item> </el-form-item>
<el-form-item label="是否政府采购" prop="isGov"> <el-form-item label="是否政府采购" prop="isGov">
<el-select v-model="queryForm.isGov" placeholder="请选择是否为政府采购" style="width: 100%"> <el-select v-model="queryForm.isGov" placeholder="请选择" style="width: 100%">
<el-option label="是" value="0"></el-option> <el-option label="是" value="0"></el-option>
<el-option label="否" value="1"></el-option> <el-option label="否" value="1"></el-option>
</el-select> </el-select>
...@@ -108,8 +108,10 @@ ...@@ -108,8 +108,10 @@
<el-input v-model="postForm.budgetName" placeholder="请输入项目名称"></el-input> <el-input v-model="postForm.budgetName" placeholder="请输入项目名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="政府采购" prop="isGov"> <el-form-item label="政府采购" prop="isGov">
<el-input v-model="isGovConvert"> <el-select v-model="postForm.isGov" placeholder="请选择" style="width: 100%">
</el-input> <el-option label="是" value="0"></el-option>
<el-option label="否" value="1"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -117,9 +119,14 @@ ...@@ -117,9 +119,14 @@
<treeselect v-model="postForm.deptId" :options="deptOptions" :show-count="true" :defaultExpandLevel="2" <treeselect v-model="postForm.deptId" :options="deptOptions" :show-count="true" :defaultExpandLevel="2"
@select="selectDept" placeholder="请选择科室" /> @select="selectDept" placeholder="请选择科室" />
</el-form-item> </el-form-item>
<el-form-item label="批复金额" prop="giveMoney"> <!-- <el-form-item label="批复金额" prop="giveMoney"> -->
<!-- <el-input v-model="postForm.giveMoney"></el-input> --> <!-- <el-input v-model="postForm.giveMoney"></el-input> -->
<el-input :value="sum" readonly> <!-- <el-input :value="sum" readonly>
<template slot="suffix">万元</template>
</el-input>
</el-form-item> -->
<el-form-item label="批复金额" prop="giveMoney">
<el-input :value="handlePrecision(sum, 4)">
<template slot="suffix">万元</template> <template slot="suffix">万元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -150,11 +157,17 @@ ...@@ -150,11 +157,17 @@
<el-input v-model="scope.row.budgetDetailed"></el-input> <el-input v-model="scope.row.budgetDetailed"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="批复金额（万元）" align="center"> <!-- <el-table-column label="批复金额（万元）" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.moneyDetailed" :controls="false" :min="0" <el-input-number v-model="scope.row.moneyDetailed" :controls="false" :min="0"
:precision="2"></el-input-number> :precision="2"></el-input-number>
</template> </template>
</el-table-column> -->
<el-table-column label="批复金额（万元）" align="center">
<template slot-scope="scope">
<el-input-number v-model="scope.row.moneyDetailed" :controls="false" :min="0" :precision="4"
readonly></el-input-number>
</template>
</el-table-column> </el-table-column>
<el-table-column label="备注" prop="remark" align="center"> <el-table-column label="备注" prop="remark" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -213,10 +226,10 @@ export default { ...@@ -213,10 +226,10 @@ export default {
computed: { computed: {
isGovConvert: { isGovConvert: {
get() { get() {
return this.queryForm.isGov === '0' ? '是' : '否' return this.postForm.isGov === '0' ? '是' : '否'
}, },
set(val) { set(val) {
this.queryForm.isGov = val this.postForm.isGov = val
} }
} }
}, },
...@@ -236,6 +249,7 @@ export default { ...@@ -236,6 +249,7 @@ export default {
}, },
// 是否政府采购 // 是否政府采购
isGovConvert: "", isGovConvert: "",
isGov: "",
// 遮罩层 // 遮罩层
loading: false, loading: false,
total: 0, total: 0,
...@@ -243,7 +257,8 @@ export default { ...@@ -243,7 +257,8 @@ export default {
budgetList: [], budgetList: [],
// 新增/编辑表单 // 新增/编辑表单
postForm: { postForm: {
schoolBudgetDetailsList: [] schoolBudgetDetailsList: [],
isGov: '0',
}, },
options: [], options: [],
// 是否显示弹出层 // 是否显示弹出层
...@@ -253,7 +268,7 @@ export default { ...@@ -253,7 +268,7 @@ export default {
budgetYear: [{ required: true, message: '年度不能为空', trigger: 'blur' }], budgetYear: [{ required: true, message: '年度不能为空', trigger: 'blur' }],
deptName: [{ required: true, message: '科室不能为空', trigger: 'blur' }], deptName: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
budgetName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], budgetName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
isGov: [{ required: true, message: '是否政府采购不能为空', trigger: 'blur' }], isGov: [{ required: true, message: '是否政府采购不能为空', trigger: 'change' }],
giveMoney: [{ required: true, message: '批复金额不能为空', trigger: 'blur' }] giveMoney: [{ required: true, message: '批复金额不能为空', trigger: 'blur' }]
}, },
// 弹出层标题 // 弹出层标题
...@@ -286,8 +301,8 @@ export default { ...@@ -286,8 +301,8 @@ export default {
sum() { sum() {
const list = this.postForm.schoolBudgetDetailsList || []; const list = this.postForm.schoolBudgetDetailsList || [];
const result = list.reduce((front, back) => { const result = list.reduce((front, back) => {
const money = this.handlePrecision(back.moneyDetailed); const money = this.handlePrecision(back.moneyDetailed, 4); // 将精度改为 4
return this.handlePrecision(front + money); return this.handlePrecision(front + money, 4); // 将精度改为 4
}, 0); }, 0);
this.postForm.giveMoney = result; this.postForm.giveMoney = result;
return result; return result;
...@@ -330,7 +345,6 @@ export default { ...@@ -330,7 +345,6 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
getBudgetList(this.queryForm).then(response => { getBudgetList(this.queryForm).then(response => {
this.loading = false; this.loading = false;
this.budgetList = response.rows; this.budgetList = response.rows;
console.log(111, this.budgetList); console.log(111, this.budgetList);
...@@ -391,6 +405,7 @@ export default { ...@@ -391,6 +405,7 @@ export default {
this.$modal.loading('正在加载数据。请稍等...'); this.$modal.loading('正在加载数据。请稍等...');
queryBudget(row.id).then(response => { queryBudget(row.id).then(response => {
this.postForm = response.data; this.postForm = response.data;
console.log('this.postForm', this.postForm);
this.open = true; this.open = true;
this.$modal.closeLoading(); this.$modal.closeLoading();
}).catch(err => { }).catch(err => {
...@@ -430,6 +445,7 @@ export default { ...@@ -430,6 +445,7 @@ export default {
this.$modal.loading('正在上传数据，请稍等...'); this.$modal.loading('正在上传数据，请稍等...');
if (this.postForm.id != null) { if (this.postForm.id != null) {
// 编辑 // 编辑
this.postForm.isGov = this.postForm.isGov; // 设置 isGov 字段的值
editBudget(this.postForm).then(response => { editBudget(this.postForm).then(response => {
this.$modal.closeLoading(); this.$modal.closeLoading();
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
...@@ -440,7 +456,10 @@ export default { ...@@ -440,7 +456,10 @@ export default {
}); });
} else { } else {
// 新增 // 新增
this.postForm.isGov = this.postForm.isGov; // 设置 isGov 字段的值
addBudget(this.postForm).then(response => { addBudget(this.postForm).then(response => {
console.log('this.postForm', this.postForm);
this.$modal.closeLoading(); this.$modal.closeLoading();
console.log(this); console.log(this);
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
......
ruoyi-ui/src/views/smartSchool/officialWork/budgetFilling/index.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }" :data="budgetList" <el-table v-loading="loading" :row-style="{ height: '35px' }" :cell-style="{ padding: '0' }" :data="budgetList"
style="font-size: 14px" stripe> style="font-size: 14px" stripe>
<el-table-column label="年度" prop="year" align="center" /> <el-table-column label="年度" prop="year" align="center" width="100px" />
<el-table-column label="科室" prop="deptName" align="center" /> <el-table-column label="科室" prop="deptName" align="center" />
<el-table-column label="填报人" prop="informant" align="center" /> <el-table-column label="填报人" prop="informant" align="center" />
<el-table-column label="分管领导" prop="leadershipName" align="center" /> <el-table-column label="分管领导" prop="leadershipName" align="center" />
...@@ -60,19 +60,20 @@ ...@@ -60,19 +60,20 @@
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="90px"> <el-form ref="postForm" :model="postForm" :rules="rules" label-width="90px">
<div> <div>
<div class="title"> <div class="title">
<input v-model="postForm.year" type="text" class="kstitle-input">年 <input v-model="postForm.year" type="text" class="kstitle-inputn">年
<input v-model="postForm.deptName" type="text" class="kstitle-input" />科室预算 <input v-model="postForm.deptName" type="text" class="kstitle-inputks
" />科室预算
</div> </div>
<div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">单位:万元</div> <div style="display: flex;justify-content: flex-end;margin-bottom: 10px;">单位:万元</div>
</div> </div>
<!-- 表格数据 --> <!-- 表格数据 -->
<el-button class="el-icon-plus" size="mini" @click="addLine()">增加</el-button> <el-button class="el-icon-plus" size="mini" @click="addLine()">增加</el-button>
<el-table border :data="xzTable" ref="xzTable" class="xzTable"> <el-table border :data="xzTable" ref="xzTable" class="xzTable" :rules="rules">
<el-table-column label="序号" type="index" align="center" /> <el-table-column label="序号" type="index" align="center" />
<el-table-column prop="projectName" label="项目名称" width="150" align="center"> <el-table-column prop="projectName" label="*项目名称" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.projectName" placeholder="请输入内容"></el-input> <el-input v-model="scope.row.projectName" placeholder="请输入内容" required></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="*申报政策依据、理由及主要内容" width="300" align="center"> <el-table-column prop="content" label="*申报政策依据、理由及主要内容" width="300" align="center">
...@@ -85,7 +86,7 @@ ...@@ -85,7 +86,7 @@
<el-input v-model="scope.row.projectExpenditures" placeholder="请输入内容"></el-input> <el-input v-model="scope.row.projectExpenditures" placeholder="请输入内容"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center"> <el-table-column label="*是否政府采购" prop="isGovernmentPurchase" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.isGovernmentPurchase" placeholder="请选择" filterable <el-select v-model="scope.row.isGovernmentPurchase" placeholder="请选择" filterable
default-first-option ref="selectInput"> default-first-option ref="selectInput">
...@@ -94,9 +95,10 @@ ...@@ -94,9 +95,10 @@
</el-select> </el-select>
</template> </template>
</el-table-column>> </el-table-column>>
<el-table-column prop="applyMoney" label="*申请金额" align="center"> <el-table-column label="*申请金额" align="center" prop="applyMoney">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.applyMoney" placeholder="请输入内容"></el-input> <el-input-number v-model="scope.row.applyMoney" :controls="false" :min="0" :precision="4"
readonly></el-input-number>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remark" label="备注" align="center"> <el-table-column prop="remark" label="备注" align="center">
...@@ -106,7 +108,7 @@ ...@@ -106,7 +108,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template> <template>
<el-button class="el-icon-minus" size="mini" @click="deleteLine">删除</el-button> <el-button class="el-icon-circle-close" size="mini" @click="deleteLine">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -148,7 +150,14 @@ ...@@ -148,7 +150,14 @@
<el-table-column prop="content" label="申报政策依据、理由及主要内容" width="300" 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="projectExpenditures" align="center" />
<el-table-column label="是否政府采购" prop="isGovernmentPurchase" align="center" width="200" /> <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="applyMoney" align="center" width="200" /> -->
<el-table-column label="申请金额" prop="applyMoney" align="center" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.applyMoney" :controls="false" :min="0" :precision="4"
:disabled="true" class="readonly-input"></el-input-number>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" align="center" width="200" /> <el-table-column label="备注" prop="remark" align="center" width="200" />
</el-table> </el-table>
...@@ -204,7 +213,7 @@ export default { ...@@ -204,7 +213,7 @@ export default {
data() { data() {
return { return {
handUserName2: "", handUserName2: "",
title: '', // 初始化 "title" 属性 title: '',
// 填报人 // 填报人
informant: "", informant: "",
// 查询表单 // 查询表单
...@@ -226,11 +235,14 @@ export default { ...@@ -226,11 +235,14 @@ export default {
budgetList: [], budgetList: [],
// 新增/编辑表单 // 新增/编辑表单
postForm: { postForm: {
schoolBudgetDetailsList: [] schoolBudgetDetailsList: [],
applyMoney: '',
}, },
// 新增表格 // 新增表格
xzTable: [ xzTable: [
{},
], ],
form: {}, form: {},
//后端传校领导列表 //后端传校领导列表
...@@ -271,7 +283,8 @@ export default { ...@@ -271,7 +283,8 @@ export default {
deptName: [{ required: true, message: '科室不能为空', trigger: 'blur' }], deptName: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
budgetName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], budgetName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
isGov: [{ required: true, message: '是否政府采购不能为空', trigger: 'blur' }], isGov: [{ required: true, message: '是否政府采购不能为空', trigger: 'blur' }],
giveMoney: [{ required: true, message: '批复金额不能为空', trigger: 'blur' }] giveMoney: [{ required: true, message: '批复金额不能为空', trigger: 'blur' }],
projectName: [{ required: true, message: "项目名称不能为空", trigger: "blur" }],
}, },
// 弹出层标题 // 弹出层标题
title: '', title: '',
...@@ -304,11 +317,24 @@ export default { ...@@ -304,11 +317,24 @@ export default {
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
handleApplyMoneyInput(row, event) {
let value = event.trim();
// 如果输入的值非空且符合数字格式，则保留四位小数
if (value !== '' && /^\d+(\.\d{1,4})?$/.test(value)) {
row.applyMoney = parseFloat(value).toFixed(4);
} else {
row.applyMoney = value;
}
},
// 新增空行数据 // 新增空行数据
addLine() { addLine() {
const newLine = { const newLine = {
...@@ -391,11 +417,11 @@ export default { ...@@ -391,11 +417,11 @@ export default {
}, },
// 处理精度 // 处理精度
handlePrecision(value, precision = 2) { handlePrecision(value, precision) {
if (precision < 1) { if (typeof value === 'number') {
return Number(value); return value.toFixed(precision);
} }
return Number(Number(value).toFixed(precision)) || 0; return value;
}, },
// 获取列表 // 获取列表
...@@ -553,6 +579,7 @@ export default { ...@@ -553,6 +579,7 @@ export default {
this.total = response.total; this.total = response.total;
} else { } else {
this.total = 0; this.total = 0;
} }
}) })
...@@ -775,6 +802,8 @@ export default { ...@@ -775,6 +802,8 @@ export default {
.title { .title {
font-size: 20px; font-size: 20px;
text-align: center; text-align: center;
color: #606266;
} }
.btn { .btn {
...@@ -813,20 +842,40 @@ export default { ...@@ -813,20 +842,40 @@ export default {
} }
.kstitle-input { .kstitle-inputn {
outline: none; outline: none;
border-top: none; border-top: none;
border-left: none; border-left: none;
border-right: none; border-right: none;
width: 80px;
color: #606266;
font-size: 20px;
text-align: center;
border-bottom: 1px solid #d7dbe3; border-bottom: 1px solid #d7dbe3;
} }
.kstitle-inputks {
outline: none;
border-top: none;
border-left: none;
border-right: none;
width: 180px;
color: #606266;
font-size: 20px;
text-align: center;
border-bottom: 1px solid #d7dbe3;
lookTable {
}
.lookTable {
::v-deep input { ::v-deep input {
border-top: none; border-top: none;
border-left: none; border-left: none;
...@@ -842,4 +891,10 @@ lookTable { ...@@ -842,4 +891,10 @@ lookTable {
.lookTable ::v-deep .el-table__header-wrapper .el-table__cell { .lookTable ::v-deep .el-table__header-wrapper .el-table__cell {
font-size: 16px !important; font-size: 16px !important;
} }
.readonly-input .el-input input {
background-color: #ffffff;
border-color: #ffffff;
cursor: not-allowed;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
...@@ -93,9 +93,10 @@ ...@@ -93,9 +93,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="活动时间" prop="activityTime" style="width: 276.66px"> <el-form-item label="活动时间" prop="activityTime">
<el-date-picker v-model="postForm.activityTime" type="datetime" <el-date-picker v-model="postForm.activityTime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" :picker-options="pickerOptions"> value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择日期" :picker-options="pickerOptions"
:style="{ width: '276.66px' }">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -108,12 +109,12 @@ ...@@ -108,12 +109,12 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="活动人数" prop="activityNumber"> <el-form-item label="活动人数" prop="activityNumber">
<el-input v-model="postForm.activityNumber" placeholder="请输入"></el-input> <el-input type="number" v-model="postForm.activityNumber" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="预计时长" prop="duration"> <el-form-item label="预计时长" prop="duration">
<el-input v-model="postForm.duration" placeholder="请输入"></el-input> <el-input type="number" v-model="postForm.duration" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -158,21 +159,30 @@ ...@@ -158,21 +159,30 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="分管领导" prop="leadershipName"> <el-form-item prop="leadershipName">
<template #label>
<span class="required">*</span>
分管领导
</template>
<el-input :value="postForm.leadershipName" placeholder="请选择分管领导" <el-input :value="postForm.leadershipName" placeholder="请选择分管领导"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input> @focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="流程单附件" prop="url"> <el-form-item prop="url">
<!-- <el-upload class="upload-demo" ref="upload" action="#" :auto-upload="true" <!-- <el-upload class="upload-demo" ref="upload" action="#" :auto-upload="true"
:before-upload="beforeUpload" :on-change="fileChange" :http-request="uploadFile" :before-upload="beforeUpload" :on-change="fileChange" :http-request="uploadFile"
:on-remove="handleRemoveFile" :file-list="fileList"> :on-remove="handleRemoveFile" :file-list="fileList">
<el-input slot="trigger" size="small" type="primary">选取文件 <el-input slot="trigger" size="small" type="primary">选取文件
</el-input> </el-input>
</el-upload> --> </el-upload> -->
<template #label>
<span class="required">*</span>
流程单附件
</template>
<FileUploadNew @input="getFileList" :limit="1" :value="fileList"></FileUploadNew> <FileUploadNew @input="getFileList" :limit="1" :value="fileList"></FileUploadNew>
<!-- <!--
limit：number 附件最大数量 limit：number 附件最大数量
...@@ -1090,4 +1100,12 @@ export default { ...@@ -1090,4 +1100,12 @@ export default {
width: 100%; width: 100%;
/* 设置宽度为100% */ /* 设置宽度为100% */
} }
.required {
color: red;
}
.label-text {
margin-left: 5px;
}
</style> </style>
ruoyi-ui/src/views/smartSchool/personWork/businessAwards/index.vue
...@@ -151,6 +151,9 @@ ...@@ -151,6 +151,9 @@
<el-button @click="cancle">取 消</el-button> <el-button @click="cancle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
</template> </template>
...@@ -179,6 +182,8 @@ export default { ...@@ -179,6 +182,8 @@ export default {
awardTime: "", awardTime: "",
gradeOfAward: "", gradeOfAward: "",
licenseIssuingAuthority: "", licenseIssuingAuthority: "",
pageNum: 1,
pageSize: 10,
}, },
title: "", title: "",
...@@ -217,7 +222,7 @@ export default { ...@@ -217,7 +222,7 @@ export default {
this.tableData = response.rows; this.tableData = response.rows;
this.loading = false; this.loading = false;
console.log(111, response.rows); console.log(111, response.rows);
this.total = response.total;
}); });
}, },
// 重置 // 重置
......
ruoyi-ui/src/views/smartSchool/personWork/logisticsWarranty/index.vue
...@@ -29,16 +29,16 @@ ...@@ -29,16 +29,16 @@
</el-row> </el-row>
<!-- 表格数据 --> <!-- 表格数据 -->
<el-table :data="applyTable" border style="width: 100%" :header-cell-style="{ background: '#f6f9fe' }"> <el-table :data="applyTable" border style="width: 100%" :header-cell-style="{ background: '#f6f9fe' }">
<el-table-column align="center" type="index" label="序号" width="80px " /> <el-table-column align="center" type="index" label="序号" width="50px" />
<el-table-column align="center" prop="id" label="报修单号" /> <el-table-column align="center" prop="id" label="报修单号" />
<el-table-column align="center" prop="repairsName" label="报修人" /> <el-table-column align="center" prop="repairsName" label="报修人" width="85px" />
<el-table-column align="center" prop="phone" label="联系方式" /> <el-table-column align="center" prop="phone" label="联系方式" width="130px" />
<el-table-column align="center" prop="repairsTime" label="报修时间" /> <el-table-column align="center" prop="repairsTime" label="报修时间" width="160px"/>
<el-table-column align="center" prop="failureEquipment" label="故障设备" /> <el-table-column align="center" prop="failureEquipment" label="故障设备" />
<el-table-column align="center" prop="failureEquipmentArea" label="设备地点" /> <el-table-column align="center" prop="failureEquipmentArea" label="设备地点" />
<el-table-column align="center" prop="failureEquipmentDescribe" label="故障描述" /> <el-table-column align="center" prop="failureEquipmentDescribe" label="故障描述" />
<el-table-column align="center" prop="maintainResult" label="维修结果" /> <el-table-column align="center" prop="maintainResult" label="维修结果" width="100px" />
<el-table-column align="center" prop="maintainState" label="维修状态"> <el-table-column align="center" prop="maintainState" label="维修状态" width="100px">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.maintainState == 1 ? "未接单" : row.maintainState == 2 ? "维修中" : "已维修 " }} {{ row.maintainState == 1 ? "未接单" : row.maintainState == 2 ? "维修中" : "已维修 " }}
</template> </template>
...@@ -220,7 +220,6 @@ ...@@ -220,7 +220,6 @@
<!--反馈结果对话框 --> <!--反馈结果对话框 -->
<el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel"> <el-dialog :title="title" :visible.sync="openfk" width="1100px" append-to-body @close="cancel">
<el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px"> <el-form ref="formfk" :model="formfk" :rules="rules" label-width="100px">
<el-form-item label="报修单号" prop="id"> <el-form-item label="报修单号" prop="id">
...@@ -229,22 +228,19 @@ ...@@ -229,22 +228,19 @@
<el-form-item class="hidden-item" label="" prop="maintainState"> <el-form-item class="hidden-item" label="" prop="maintainState">
<el-input v-model="formfk.maintainState" placeholder="维修状态"></el-input> <el-input v-model="formfk.maintainState" placeholder="维修状态"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报修结果" prop="maintainResult"> <el-form-item label="报修结果" prop="maintainResult">
<el-input v-model="formfk.maintainResult" placeholder="报修结果"></el-input> <el-input v-model="formfk.maintainResult" placeholder="报修结果"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="评价" prop="phevaluateone"> <el-form-item label="评价" prop="phevaluateone">
<el-rate v-model="formfk.evaluate" :max="5"></el-rate> <el-rate v-model="formfk.evaluate" :max="5"></el-rate>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="text-align: center"> <div style="text-align: center">
<el-button type="primary" @click="submitFormfk">确 定</el-button> <el-button type="primary" @click="submitFormfk">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination> @pagination="getList"></pagination>
...@@ -275,6 +271,8 @@ export default { ...@@ -275,6 +271,8 @@ export default {
id: "", id: "",
repairsTime: "", repairsTime: "",
maintainState: "", maintainState: "",
pageNum: 1,
pageSize: 10,
}, },
// 表格数据 // 表格数据
applyTable: [], applyTable: [],
......
ruoyi-ui/src/views/smartSchool/personWork/materialPreparation/index.vue
...@@ -105,6 +105,8 @@ ...@@ -105,6 +105,8 @@
<el-button @click="cancle">取 消</el-button> <el-button @click="cancle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
</template> </template>
...@@ -130,6 +132,8 @@ export default { ...@@ -130,6 +132,8 @@ export default {
queryParams: { queryParams: {
name: "", name: "",
publishTime: "", publishTime: "",
pageNum: 1,
pageSize: 10,
}, },
title: "", title: "",
rules: { rules: {
...@@ -166,6 +170,7 @@ export default { ...@@ -166,6 +170,7 @@ export default {
getMaterial(this.queryParams).then((response) => { getMaterial(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
this.loading = false; this.loading = false;
this.total = response.total;
console.log(111, response.rows); console.log(111, response.rows);
}); });
......
ruoyi-ui/src/views/smartSchool/personWork/paperSituation/index.vue
...@@ -164,10 +164,11 @@ ...@@ -164,10 +164,11 @@
</el-form> </el-form>
<div slot="footer"> <div slot="footer">
<el-button @click="cancle">取 消</el-button> <el-button @click="cancle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
</template> </template>
...@@ -198,6 +199,8 @@ export default { ...@@ -198,6 +199,8 @@ export default {
level: "", level: "",
grade: "", grade: "",
publishTime: "", publishTime: "",
pageNum: 1,
pageSize: 10,
}, },
title: "", title: "",
rules: { rules: {
...@@ -234,6 +237,7 @@ export default { ...@@ -234,6 +237,7 @@ export default {
this.tableData = response.rows; this.tableData = response.rows;
console.log('this.tableData', this.tableData); console.log('this.tableData', this.tableData);
this.loading = false; this.loading = false;
this.total = response.total;
console.log(111, response.rows); console.log(111, response.rows);
}); });
......
ruoyi-ui/src/views/smartSchool/personWork/recordingroomAppointment/myAppointment/index.vue
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
<el-table-column label="预约节次" align="center" prop="appointmentJc" /> <el-table-column label="预约节次" align="center" prop="appointmentJc" />
<el-table-column label="录播内容" align="center" prop="studioContent" /> <el-table-column label="录播内容" align="center" prop="studioContent" />
<el-table-column label="预约人" align="center" prop="appointmentUserName" /> <el-table-column label="预约人" align="center" prop="appointmentUserName" />
<el-table-column label="申请时间" align="center" min-width="200px" prop="applyTime" /> <el-table-column label="申请时间" align="center" prop="applyTime" />
<el-table-column label="状态" align="center" min-width="200px" prop="statu"> <el-table-column label="状态" align="center" prop="statu">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.statu == 1 ? "预约成功" : row.statu == 2 ? "取消" : "" }} {{ row.statu == 1 ? "预约成功" : row.statu == 2 ? "取消" : "" }}
</template> </template>
...@@ -83,7 +83,8 @@ ...@@ -83,7 +83,8 @@
</div> </div>
</el-form> </el-form>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
...@@ -108,6 +109,8 @@ export default { ...@@ -108,6 +109,8 @@ export default {
queryParams: { queryParams: {
startTime: "", startTime: "",
endTime: "", endTime: "",
pageNum: 1,
pageSize: 10,
}, },
// 录播室名称 // 录播室名称
studioName: "", studioName: "",
......
ruoyi-ui/src/views/smartSchool/personWork/traiNing/index.vue
<template> <template>
<div class="" style="padding:15px 10px 0 10px"> <div class="" style="padding:15px 10px 0 10px">
<el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small"> <el-form :model="queryParams" ref="queryForm" :inline="true" style="padding:0 0 0 0" size="small">
<el-form-item prop="trainingTime" > <el-form-item prop="trainingTime">
<el-date-picker v-model="queryParams.trainingTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" <el-date-picker v-model="queryParams.trainingTime" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" clearable> format="yyyy-MM-dd" clearable>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item prop="trainingName"> <el-form-item prop="trainingName">
<el-input v-model="queryParams.trainingName" placeholder="培训名称" clearable/> <el-input v-model="queryParams.trainingName" placeholder="培训名称" clearable />
</el-form-item> </el-form-item>
<el-form-item prop="isQualified"> <el-form-item prop="isQualified">
<el-select v-model="queryParams.isQualified" placeholder="是否合格"> <el-select v-model="queryParams.isQualified" placeholder="是否合格">
<el-option v-for="dict in dict.type. <el-option v-for="dict in dict.type.
is_qualified" :key="dict.value" :label="dict.label" :value="dict.value" clearable/> is_qualified" :key="dict.value" :label="dict.label" :value="dict.value" clearable />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -135,6 +135,8 @@ ...@@ -135,6 +135,8 @@
<el-button @click="cancle">取 消</el-button> <el-button @click="cancle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
</template> </template>
...@@ -163,7 +165,8 @@ export default { ...@@ -163,7 +165,8 @@ export default {
trainingTime: "", trainingTime: "",
trainingName: "", trainingName: "",
isQualified: "", isQualified: "",
pageNum: 1,
pageSize: 10,
}, },
// 附件 // 附件
...@@ -202,6 +205,7 @@ export default { ...@@ -202,6 +205,7 @@ export default {
this.tableData = response.rows; this.tableData = response.rows;
console.log('this.tableData', this.tableData); console.log('this.tableData', this.tableData);
this.loading = false; this.loading = false;
this.total = response.total;
}); });
}, },
......
ruoyi-ui/src/views/smartSchool/venueReservation/appointmentRecordingroom/index.vue
...@@ -77,6 +77,9 @@ ...@@ -77,6 +77,9 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
...@@ -100,6 +103,8 @@ export default { ...@@ -100,6 +103,8 @@ export default {
queryParams: { queryParams: {
dateRange: [], dateRange: [],
appointmentUserName: "", appointmentUserName: "",
pageNum: 1,
pageSize: 10,
}, },
// 加载遮罩 // 加载遮罩
loading: true, loading: true,
......
ruoyi-ui/src/views/smartSchool/venueReservation/audreservationStatus/index.vue
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
</el-form> </el-form>
<!-- 表格信息 --> <!-- 表格信息 -->
<el-table stripe ref="applyTable" v-loading="loading" :data="infoList" :cell-style="cellStyle"> <el-table border 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 type="index" label="序号" width="50" align="center"></el-table-column>
<el-table-column label="活动名称" align="center" prop="activityName" /> <el-table-column label="活动名称" align="center" prop="activityName" />
<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" width="80" />
<el-table-column label="是否彩排" align="center" width="120px" prop="isRehearsal"> <el-table-column label="是否彩排" align="center" width="120px" prop="isRehearsal">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.isRehearsal == 0 ? "否" : row.isRehearsal == 1 ? "是" : "" }} {{ row.isRehearsal == 0 ? "否" : row.isRehearsal == 1 ? "是" : "" }}
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</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" fixed="right" <el-table-column label="操作" align="center" 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" -->
......
ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
<el-button @click="cancle">取 消</el-button> <el-button @click="cancle">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList"></pagination>
</div> </div>
</template> </template>
...@@ -91,6 +94,8 @@ export default { ...@@ -91,6 +94,8 @@ export default {
studioStatu: "", studioStatu: "",
queryParams: { queryParams: {
studioArea: "", studioArea: "",
pageNum: 1,
pageSize: 10,
}, },
title: "", title: "",
rules: { rules: {
...@@ -123,6 +128,7 @@ export default { ...@@ -123,6 +128,7 @@ export default {
getStudio(this.queryParams).then((response) => { getStudio(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
this.loading = false; this.loading = false;
this.total = response.total;
console.log(111, response.rows); console.log(111, response.rows);
}); });
......
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