- 确认
- 取消
- 关闭
+ 取消
+ 关闭
@@ -260,8 +200,9 @@
} from '@/api/apply/index.js'
import myMixins from "@/mixin/selectMixin.js";
+ import formMixin from "@/mixin/formMixin.js";
export default {
- mixins: [myMixins],
+ mixins: [myMixins, formMixin],
components: {
},
@@ -271,8 +212,8 @@
type: 'show',
typeName: '查看个人明细',
id: '',
- action: `${process.env.VUE_APP_UPLOAD_API}`,
- host:`${process.env.VUE_APP_BASE_API}`,
+ action: `${process.env.VUE_APP_UPLOAD_API}`,
+ host: `${process.env.VUE_APP_BASE_API}`,
subjectObj: {},
student_info: {},
row: {},
@@ -283,53 +224,55 @@
show: '',
status: 0,
score: '',
+ giveup_reason: '',
file_ids: [],
- reason: '',
- position:''
+ reason: '',
+ position: ''
},
}
},
created() {},
methods: {
- uploadSuccess(response, file, fileList) {
- this.fileList = fileList
- },
- uploadRemove(file, fileList) {
- this.fileList = fileList
- },
- // beforeUpload(file) {
- // const isImage = file.type.includes('image');
- // if (!isImage) {
- // this.$message.error('请上传正确的图片格式文件');
- // }
- // return isImage && isLt2M;
+ uploadSuccess(response, file, fileList) {
+ this.fileList = fileList
+ },
+ uploadRemove(file, fileList) {
+ this.fileList = fileList
+ },
+ // beforeUpload(file) {
+ // const isImage = file.type.includes('image');
+ // if (!isImage) {
+ // this.$message.error('请上传正确的图片格式文件');
+ // }
+ // return isImage && isLt2M;
// },
submit() {
if (this.id) {
this.form.id = this.id
- }
- let _arr = []
- if (this.fileList.length > 0) {
- this.fileList.map(item => {
- if (item.response) {
- _arr.push(item.response.id)
- } else {
- _arr.push(item.id)
- }
- })
- }
+ }
+ let _arr = []
+ if (this.fileList.length > 0) {
+ this.fileList.map(item => {
+ if (item.response) {
+ _arr.push(item.response.id)
+ } else {
+ _arr.push(item.id)
+ }
+ })
+ }
this.form.file_ids = _arr
save({
...this.row,
status: this.form.status,
reason: this.form.reason,
- score: this.form.score,
- file_ids:this.form.file_ids,
- position:this.form.position
+ score: this.form.score,
+ giveup_reason: this.form.giveup_reason,
+ file_ids: this.form.file_ids,
+ position: this.form.position
}).then(res => {
this.$message({
type: 'success',
- message: this.type==='check' ? '审核成功' : '设置成功'
+ message: this.type === 'check' ? '审核成功' : '设置成功'
})
this.isShow = false
this.$emit('refresh')
@@ -349,24 +292,30 @@
show_relation: ['user']
}).then(res => {
this.student_info = res.user
- this.sign_result = res
- this.form.position = res.position?res.position:''
- if(res.data && Array.isArray(res.data)){
- res.data.map(item=>{
- if(!this.base.isNull(item.value) && item.value.indexOf("/storage/files/")!==-1){
- item.submit_files = item.value.split(",")
+ this.sign_result = res
+ this.form.position = res.position ? res.position : ''
+ let _arr = []
+ if (res.data && Array.isArray(res.data)) {
+ res.data.map(item => {
+ if (!this.base.isNull(item.value) && item.value.indexOf("/storage/files/") !== -1) {
+ item.submit_files = item.value.split(",")
}
- })
- this.sign_info = res.data
- }else{
- this.sign_info = []
- }
- this.form.status = res.status?res.status:0
- this.form.score = res.score?res.score:''
- this.form.reason = res.reason?res.reason:''
- this.fileList = res.files?res.files:[]
-
- console.log("this.sign_info",this.sign_info)
+ // 处理自定义字段中是否 是个人用户信息
+ if (!this.student_info.hasOwnProperty(item.field)) {
+ console.log("item.field")
+ _arr.push(item)
+ }
+ })
+ this.sign_info = _arr
+ } else {
+ this.sign_info = []
+ }
+ this.form.status = res.status ? res.status : 0
+ this.form.score = res.score ? res.score : ''
+ this.form.reason = res.reason ? res.reason : ''
+ this.fileList = res.files ? res.files : []
+
+ console.log("this.sign_info", this.sign_info)
})
}
},
@@ -376,14 +325,14 @@
if (this.type === 'show') {
this.typeName = "查看个人明细"
this.getDetail()
- } else if (this.type === 'check' || this.type === 'checkshow' || this.type==='setPosition') {
- this.getSignDetail()
- if(this.type==='check'){
- this.typeName = '审核'
- }else if(this.type==='setPosition'){
- this.typeName = '设置班委'
- }else{
- this.typeName = '查看'
+ } else if (this.type === 'check' || this.type === 'checkshow' || this.type === 'setPosition') {
+ this.getSignDetail()
+ if (this.type === 'check') {
+ this.typeName = '审核'
+ } else if (this.type === 'setPosition') {
+ this.typeName = '设置班委'
+ } else {
+ this.typeName = '查看'
}
}
@@ -392,7 +341,7 @@
this.type = 'show'
this.subjectObj = {}
this.sign_result = {}
- this.sign_info = []
+ this.sign_info = []
this.fileList = []
this.$refs['dialog'].reset()
}
@@ -403,9 +352,10 @@
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index eb17454..f695ef0 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -17,6 +17,10 @@
+
+
查询
导入
@@ -96,21 +114,31 @@
@selection-change="selectionChange" :total="total" :table-item="table_item">
-
+
-
课程名称：{{subjectObj.title}}
- 开课日期：{{subjectObj.date}}
- 课程体系：{{subjectObj.leibie}}
+
+
@@ -56,10 +101,9 @@
-
+
- 审核
+ 审核
查看
@@ -76,15 +120,17 @@
diff --git a/src/views/course/components/editPane.vue b/src/views/course/components/editPane.vue
index 252151b..b21db03 100644
--- a/src/views/course/components/editPane.vue
+++ b/src/views/course/components/editPane.vue
@@ -5,8 +5,8 @@
-
@@ -77,7 +77,7 @@
translate
} from "@/api/system/customFormField";
import {
- debounce,
+ debounce,
deepCopy
} from "@/utils";
import formMixins from "@/mixin/formMixin.js";
@@ -128,14 +128,32 @@
},
changeIsUser(e) {
- console.log("e", e)
- console.log(this.selectedForm)
- this.selectFormList.map(item => {
- if (e === item.belong_user_table) {
- this.selectedForm = this.base.requestToForm(item,this.selectedForm)
- console.log(this.selectedForm)
- }
- })
+ console.log("e", e)
+ console.log(this.selectedForm)
+ if(e){
+ this.selectFormList.map(item => {
+ if (e === item.belong_user_table) {
+ // this.selectedForm = this.base.requestToForm(item,this.selectedForm)
+ this.selectedForm.name = item.name
+ this.selectedForm.field = item.field
+ this.selectedForm.help = item.help
+ this.selectedForm.select_item = item.select_item
+ this.selectedForm.rule = item.rule
+ this.selectedForm.belong_user = item.belong_user
+ this.selectedForm.edit_input = item.edit_input
+ this.selectItem = item.select_item
+ this.validation = []
+ if(!this.base.isNull(this.selectedForm.rule)){
+ this.validation = this.selectedForm.rule.split(",")
+ }
+ console.log("2", this.selectedForm,this.validation)
+ }
+ })
+ }else{
+ this.selectedForm.belong_user = 0
+
+ }
+
},
saveField() {
diff --git a/src/views/course/components/editSign.vue b/src/views/course/components/editSign.vue
new file mode 100644
index 0000000..757f19f
--- /dev/null
+++ b/src/views/course/components/editSign.vue
@@ -0,0 +1,216 @@
+
+
+
课程名称：{{subjectObj.title}}
+ 开课日期：{{subjectObj.date}}
+ 课程体系：{{subjectObj.leibie}}
+
+
+
+
+
+
+
+
+
diff --git a/src/views/course/components/setMainTeacher.vue b/src/views/course/components/setMainTeacher.vue
index 51aac09..e52120d 100644
--- a/src/views/course/components/setMainTeacher.vue
+++ b/src/views/course/components/setMainTeacher.vue
@@ -8,7 +8,7 @@
*班主任：
+
+
+
+
+
+
+
+ *{{item.name}}：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -36,7 +36,7 @@
form: {
teacher_id: '',
},
-
+ teachers:[],
rules: {
teacher_id: [{
required: true,
@@ -51,7 +51,10 @@
setTeachers(e){
this.teacher_options = e
},
- submit() {
+ submit() {
+ if(this.teachers.length>0){
+ this.form.teacher_id = this.teachers.join(",")
+ }
save({
...this.form
}).then(res => {
@@ -68,7 +71,14 @@
show({
id: this.id
}).then(res => {
- this.form = this.base.deepCopy(res, this.form)
+ this.form = this.base.deepCopy(res, this.form)
+ res.teacher_detail.map(item=>{
+ this.teachers.push(item.id)
+ })
+ // this.teachers = this.form.teacher_id?this.form.teacher_id.split(","):[],
+ // this.$nextTick(function(){
+ // this.teachers = this.form.teacher_id?this.form.teacher_id.split(","):[]
+ // })
})
},
},
@@ -77,7 +87,8 @@
if (newVal) {
this.getDetail()
} else {
- this.id = ''
+ this.id = ''
+ this.teachers = []
this.$refs['dialog'].reset()
}
},
diff --git a/src/views/course/pay.vue b/src/views/course/pay.vue
index 2198cf9..5d17de1 100644
--- a/src/views/course/pay.vue
+++ b/src/views/course/pay.vue
@@ -67,12 +67,12 @@
-
+
-
@@ -80,8 +80,8 @@
-
-
+ 核对
diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue
index 273e226..fcbec3f 100644
--- a/src/views/course/txl.vue
+++ b/src/views/course/txl.vue
@@ -1,6 +1,5 @@
-
+
- 姓名
+ {{item.name}}
- {{student_info.username?student_info.username:''}}
+ {{student_info[item.field]?student_info[item.field]:''}}
-
+
- 性别
+ 本班职务
- {{student_info.sex?student_info.sex:''}}
+ {{sign_result.position?sign_result.position:''}}
-
-
- 身份证号
-
- {{student_info.idcard?student_info.idcard:''}}
-
-
-
- 联系方式
-
- {{student_info.mobile?student_info.mobile:''}}
-
-
-
- 出生日期
-
- {{student_info.birthday?student_info.birthday:''}}
-
-
-
- 邮箱
-
- {{student_info.email?student_info.email:''}}
-
-
-
- 公司名称
-
- {{student_info.company_name?student_info.company_name:''}}
-
-
-
- 职务
-
- {{student_info.company_position?student_info.company_position:''}}
-
-
-
- 本班职务
-
- {{sign_result.position?sign_result.position:''}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
-
@@ -17,11 +16,7 @@
@@ -58,14 +53,15 @@
-
+
- 设置班委
- 查看
+ 编辑
+ 查看
@@ -108,11 +104,14 @@
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index e7d8ec7..641430a 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -17,127 +17,55 @@
-
-
-
-
+
+
查询
+ 导入
导出
@@ -95,12 +91,12 @@
-
-
-
-
-
- {{item.name}}
-
-
-
-
- {{item.name}}
-
- {{item.value}}
-
-
-
-
-
-
+
+
+
-
- ![]()
-
-
-
+
+
+
+
+ {{item.name}}
+
+
+
+
+ {{item.name}}
+
+ {{item.value}}
+
+
+
+
+
+
-
+
-
+
+ ![]()
+
+
+
@@ -151,15 +79,19 @@
评分：
{{sign_result.score}}
-
-
- 录取通知书：
-
+
-
-
-
+
+ 放弃原因：
+ {{sign_result.giveup_reason}}
+
+
+ 录取通知书：
+
+
+
+
备注：
@@ -196,17 +128,25 @@
+
+
+ 放弃原因：
+
+
+
+
录取通知书：
-
- 点击上传
+
+ 点击上传
@@ -218,30 +158,30 @@
备注：
只能上传pdf文件
-
+
+
-
-
-
-
+ 班委名称：
+
+
+
-
- 班委名称：
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{base.maskPhoneNumber(scope.row.mobile)}}
-
-
-
+
+
+
+
+ {{base.maskPhoneNumber(scope.row.mobile)}}
+
+
+
@@ -133,8 +161,10 @@
-
+
+ 编辑
+
查看
@@ -142,25 +172,32 @@
- {{index+1}}、{{item.name}}
+
+
-
-
-
+ {{state.value}}
+
+
+
+ {{item.course.year?item.course.year:''}}{{item.course.type_detail.name+' | '}}{{item.course.name}}
+
+
+