wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-18 02:56:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步2.1版本

Browse Source
This commit is contained in:
Jerry
2021-12-16 21:56:20 +08:00
parent 7af7fe5dc2
commit 387dc5c939
1021 changed files with 3273 additions and 18434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
orange-demo-multi/orange-demo-multi-web/src/views/generated/formClass.vue
View File

@@ -33,7 +33,7 @@
</div>
</div>
<el-row class="no-scroll" :gutter="20">
<el-col class="table-box" :span="24">
<el-col class="table-box gutter-bottom" :span="24">
<el-table ref="studentClass" :data="formClass.StudentClass.impl.dataList" size="mini" @sort-change="formClass.StudentClass.impl.onSortChange"
header-cell-class-name="table-header-gray"
highlight-current-row @current-change="formClass.StudentClass.impl.currentRowChange">
@@ -89,7 +89,7 @@
</div>
</div>
<el-row class="no-scroll" :gutter="20">
<el-col class="table-box" :span="24">
<el-col class="table-box gutter-bottom" :span="24">
<el-table ref="course" :data="formClass.Course.impl.dataList" size="mini" @sort-change="formClass.Course.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Course.impl.getTableIndex" />
@@ -139,7 +139,7 @@
</div>
</div>
<el-row class="no-scroll" :gutter="20">
<el-col class="table-box" :span="24">
<el-col class="table-box gutter-bottom" :span="24">
<el-table ref="student" :data="formClass.Student.impl.dataList" size="mini" @sort-change="formClass.Student.impl.onSortChange"
header-cell-class-name="table-header-gray">
<el-table-column label="序号" header-align="center" align="center" type="index" width="55px" :index="formClass.Student.impl.getTableIndex" />
@@ -481,13 +481,6 @@ export default {
* 移除
*/
onDeleteClassCourseClick (row) {
if (
(this.formClass.StudentClass.impl.currentRow || {}).classId == null ||
row.courseId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
classId: (this.formClass.StudentClass.impl.currentRow || {}).classId,
courseId: row.courseId
@@ -519,13 +512,6 @@ export default {
* 移除
*/
onDeleteClassStudentClick (row) {
if (
(this.formClass.StudentClass.impl.currentRow || {}).classId == null ||
row.studentId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
classId: (this.formClass.StudentClass.impl.currentRow || {}).classId,
studentId: row.studentId
@@ -556,12 +542,6 @@ export default {
* 删除
*/
onDeleteClick (row) {
if (
row.classId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
classId: row.classId
};

8
orange-demo-multi/orange-demo-multi-web/src/views/generated/formCourse.vue
View File

@@ -102,6 +102,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -282,12 +284,6 @@ export default {
* 删除
*/
onDeleteClick (row) {
if (
row.courseId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
courseId: row.courseId
};

4
orange-demo-multi/orange-demo-multi-web/src/views/generated/formCourseStats.vue
View File

@@ -49,7 +49,7 @@
</div>
</el-card>
</el-col>
<el-col class="table-box" :span="24">
<el-col class="table-box gutter-bottom" :span="24">
<el-card class="base-card" style="height: 350px" shadow="never" :body-style="{padding: '0px'}">
<div slot="header" class="base-card-header">
<span>课程流水统计</span>
@@ -74,6 +74,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';

14
orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateClass.vue
View File

@@ -149,9 +149,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -230,16 +230,6 @@ export default {
onAddClick () {
this.$refs.formCreateClass.validate((valid) => {
if (!valid) return;
if (
this.formData.StudentClass.className == null ||
this.formData.StudentClass.schoolId == null ||
this.formData.StudentClass.leaderId == null ||
this.formData.StudentClass.finishClassHour == null ||
this.formData.StudentClass.classLevel == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
studentClassDto: {
className: this.formData.StudentClass.className,

18
orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateCourse.vue
View File

@@ -98,6 +98,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -182,9 +184,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -256,18 +258,6 @@ export default {
onAddClick () {
this.$refs.formCreateCourse.validate((valid) => {
if (!valid) return;
if (
this.formData.Course.courseName == null ||
this.formData.Course.price == null ||
this.formData.Course.difficulty == null ||
this.formData.Course.gradeId == null ||
this.formData.Course.subjectId == null ||
this.formData.Course.classHour == null ||
this.formData.Course.pictureUrl == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
courseDto: {
courseName: this.formData.Course.courseName,

19
orange-demo-multi/orange-demo-multi-web/src/views/generated/formCreateStudent.vue
View File

@@ -234,9 +234,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -401,21 +401,6 @@ export default {
onAddClick () {
this.$refs.formCreateStudent.validate((valid) => {
if (!valid) return;
if (
this.formData.Student.loginMobile == null ||
this.formData.Student.studentName == null ||
this.formData.Student.provinceId == null ||
this.formData.Student.cityId == null ||
this.formData.Student.districtId == null ||
this.formData.Student.gender == null ||
this.formData.Student.birthday == null ||
this.formData.Student.experienceLevel == null ||
this.formData.Student.gradeId == null ||
this.formData.Student.schoolId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
studentDto: {
loginMobile: this.formData.Student.loginMobile,

15
orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditClass.vue
View File

@@ -152,9 +152,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -238,17 +238,6 @@ export default {
onUpdateClick () {
this.$refs.formEditClass.validate((valid) => {
if (!valid) return;
if (
this.classId == null ||
this.formData.StudentClass.className == null ||
this.formData.StudentClass.schoolId == null ||
this.formData.StudentClass.leaderId == null ||
this.formData.StudentClass.finishClassHour == null ||
this.formData.StudentClass.classLevel == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
studentClassDto: {
classId: this.classId,

13
orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditClassCourseOrder.vue
View File

@@ -30,6 +30,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { uploadMixin, statsDateRangeMixin } from '@/core/mixins';
@@ -90,9 +92,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -110,13 +112,6 @@ export default {
* 保存
*/
onUpdateClassCourseClick () {
if (
this.classId == null ||
this.courseId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
classCourseDto: {
classId: this.classId,

19
orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditCourse.vue
View File

@@ -98,6 +98,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -185,9 +187,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -261,19 +263,6 @@ export default {
onUpdateClick () {
this.$refs.formEditCourse.validate((valid) => {
if (!valid) return;
if (
this.courseId == null ||
this.formData.Course.courseName == null ||
this.formData.Course.price == null ||
this.formData.Course.difficulty == null ||
this.formData.Course.gradeId == null ||
this.formData.Course.subjectId == null ||
this.formData.Course.classHour == null ||
this.formData.Course.pictureUrl == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
courseDto: {
courseId: this.courseId,

20
orange-demo-multi/orange-demo-multi-web/src/views/generated/formEditStudent.vue
View File

@@ -279,9 +279,9 @@ export default {
}
},
methods: {
onCancel (isSuccess) {
onCancel (isSuccess, data) {
if (this.observer != null) {
this.observer.cancel(isSuccess);
this.observer.cancel(isSuccess, data);
}
},
/**
@@ -469,22 +469,6 @@ export default {
onUpdateClick () {
this.$refs.formEditStudent.validate((valid) => {
if (!valid) return;
if (
this.studentId == null ||
this.formData.Student.loginMobile == null ||
this.formData.Student.studentName == null ||
this.formData.Student.provinceId == null ||
this.formData.Student.cityId == null ||
this.formData.Student.districtId == null ||
this.formData.Student.gender == null ||
this.formData.Student.birthday == null ||
this.formData.Student.experienceLevel == null ||
this.formData.Student.gradeId == null ||
this.formData.Student.schoolId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
studentDto: {
studentId: this.studentId,

8
orange-demo-multi/orange-demo-multi-web/src/views/generated/formSetClassCourse.vue
View File

@@ -87,6 +87,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -262,12 +264,6 @@ export default {
* 添加
*/
onAddClassCourseClick () {
if (
this.classId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
classId: this.classId,
classCourseDtoList: this.tableSelectRowList.map((item) => {

8
orange-demo-multi/orange-demo-multi-web/src/views/generated/formSetClassStudent.vue
View File

@@ -66,6 +66,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -187,12 +189,6 @@ export default {
* 添加
*/
onAddClassStudentClick () {
if (
this.classId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
classId: this.classId,
classStudentDtoList: this.tableSelectRowList.map((item) => {

8
orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudent.vue
View File

@@ -97,6 +97,8 @@
<script>
import { mapGetters } from 'vuex';
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';
@@ -267,12 +269,6 @@ export default {
* 删除
*/
onDeleteClick (row) {
if (
row.studentId == null
) {
this.$message.error('请求失败，发现必填参数为空！');
return;
}
let params = {
studentId: row.studentId
};

2
orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudentActionDetail.vue
View File

@@ -80,6 +80,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';

2
orange-demo-multi/orange-demo-multi-web/src/views/generated/formStudentActionStats.vue
View File

@@ -88,6 +88,8 @@
<script>
/* eslint-disable-next-line */
import { findTreeNode, findTreeNodePath, findItemFromList } from '@/utils';
/* eslint-disable-next-line */
import rules from '@/utils/validate.js';
/* eslint-disable-next-line */
import { DropdownWidget, TableWidget, UploadWidget, ChartWidget } from '@/utils/widget.js';

2
orange-demo-multi/orange-demo-multi-web/src/views/layout/index.vue
View File

@@ -184,5 +184,5 @@ export default {
}
</script>
<style lang="scss" scoped>
<style lang="scss">
</style>

7
orange-demo-multi/orange-demo-multi-web/src/views/upms/formSysDept/index.vue
View File

@@ -78,6 +78,13 @@ export default {
params.sysDeptDtoFilter = {
deptName: this.formSysDept.formFilterCopy.deptName
};
// 按照显示顺序排序
params.orderParam = [
{
fieldName: 'showOrder',
asc: true
}
];
return new Promise((resolve, reject) => {
SysDeptController.list(this, params).then(res => {
resolve({