Commit 13469014 by zhaopanyu

zpy 11.9

parent fa8c7cb3
...@@ -220,6 +220,8 @@ export default { ...@@ -220,6 +220,8 @@ export default {
return { return {
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
awardsLevel: "", awardsLevel: "",
awardsType: "", awardsType: "",
startTime: "", startTime: "",
...@@ -292,7 +294,6 @@ export default { ...@@ -292,7 +294,6 @@ export default {
}, },
methods: { methods: {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.dialogTableVisible = true; this.dialogTableVisible = true;
...@@ -346,7 +347,7 @@ export default { ...@@ -346,7 +347,7 @@ export default {
handleExamine(row) { handleExamine(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm("是否提交该活动?") .confirm("是否提交该信息?")
.then(function () { .then(function () {
const params = { const params = {
id: row.id, id: row.id,
...@@ -447,6 +448,8 @@ export default { ...@@ -447,6 +448,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
awardsLevel: "", awardsLevel: "",
awardsType: "", awardsType: "",
startTime: "", startTime: "",
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</div> </div>
</div> </div>
</el-upload> </el-upload>
<i class="el-icon-delete" @click="handleRemove(index)"></i>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
...@@ -77,9 +77,7 @@ ...@@ -77,9 +77,7 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</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>
</el-form-item> </el-form-item>
<el-row :gutter="10" class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-row>
</el-form> </el-form>
<el-table :data="tableData" :default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%"> <el-table :data="tableData" :default-sort="{ prop: 'punishTime', order: 'descending' }" border style="width: 100%">
<el-table-column align="center" type="index" label="序号" width="55" /> <el-table-column align="center" type="index" label="序号" width="55" />
...@@ -299,10 +297,12 @@ import { ...@@ -299,10 +297,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate' import { checkIdcard } from '@/utils/utilLibrary/validate'
export default { export default {
name: 'index', name: 'index',
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester','audit_state1'], dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester', 'audit_state1'],
data() { data() {
return { return {
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
...@@ -615,6 +615,8 @@ export default { ...@@ -615,6 +615,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
......
...@@ -308,10 +308,12 @@ import { ...@@ -308,10 +308,12 @@ import {
import { checkIdcard } from '@/utils/utilLibrary/validate' import { checkIdcard } from '@/utils/utilLibrary/validate'
export default { export default {
name: 'index', name: 'index',
dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester','audit_state1'], dicts: ['violate_type', 'violate_num', 'punish_result', 'sys_user_sex', 'grade_type', 'semester', 'audit_state1'],
data() { data() {
return { return {
queryForm: { queryForm: {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
...@@ -334,6 +336,7 @@ export default { ...@@ -334,6 +336,7 @@ export default {
], ],
open: false,
//查看弹窗表格 //查看弹窗表格
ExperimentalData: [], ExperimentalData: [],
form: { form: {
...@@ -516,7 +519,7 @@ export default { ...@@ -516,7 +519,7 @@ export default {
handleExamine(row) { handleExamine(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$modal this.$modal
.confirm("是否提交该活动?") .confirm("是否提交该信息?")
.then(function () { .then(function () {
const params = { const params = {
id: row.id, id: row.id,
...@@ -532,6 +535,7 @@ export default { ...@@ -532,6 +535,7 @@ export default {
console.error(err); console.error(err);
}); });
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {
this.$modal.confirm(`是否确认删除此数据?`).then(() => { this.$modal.confirm(`是否确认删除此数据?`).then(() => {
...@@ -622,6 +626,8 @@ export default { ...@@ -622,6 +626,8 @@ export default {
resetQuery() { resetQuery() {
this.queryForm = { this.queryForm = {
pageNum: 1,
pageSize: 10,
schoolYear: "", schoolYear: "",
semester: "", semester: "",
gradeYear: "", gradeYear: "",
......
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