diff --git a/src/views/book/components/checkBook.vue b/src/views/book/components/checkBook.vue
index 7d8a7aa..a5455dd 100644
--- a/src/views/book/components/checkBook.vue
+++ b/src/views/book/components/checkBook.vue
@@ -35,7 +35,6 @@
同行人:
-
@@ -57,6 +56,13 @@
v-if="submitObj.status===item.id">{{item.value}}
+
+
审核意见:
@@ -148,7 +154,8 @@
type: 'show',
id: '',
submitObj: {},
- thirdArr: [],
+ thirdArr: [],
+ baseUrl:`${process.env.VUE_APP_BASE_API}`,
form: {
name: '',
},
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index e87ec3a..532389a 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -40,7 +40,7 @@
-
@@ -60,7 +60,7 @@
-
+
查看
diff --git a/src/views/component/imports.vue b/src/views/component/imports.vue
index c005418..97a99ca 100644
--- a/src/views/component/imports.vue
+++ b/src/views/component/imports.vue
@@ -82,7 +82,7 @@
let _except = []
// 学员去除一些信息
if (this.tableName === 'users') {
- _except = ['plate', 'is_import', 'is_vip', 'is_schoolmate', 'appointment_total', 'letter', 'score', 'code',
+ _except = ['introduce','honour','company_need_fund','company_other','remark','plate', 'is_import', 'is_vip', 'is_schoolmate', 'appointment_total', 'letter', 'score', 'code',
'pid'
]
}
@@ -127,10 +127,15 @@
})
}
// 学员 + 课程
- if (this.tableName === 'users') {
+ if (this.tableName === 'users') {
+ b.unshift({
+ key: 'status',
+ title: '审核状态',
+ width: 120
+ });
b.unshift({
key: 'course_name',
- title: '课程名字',
+ title: '课程名称',
width: 120
});
}
@@ -211,10 +216,10 @@
console.log("data", data)
if (this.tableName === 'course_keeps') {
data.push(['(上传前请删除示例)', '', '', ''])
- data.push(['(请设置单元格格式为文本格式)2024-09-03', 'xxx', '出勤/缺勤'])
+ data.push(['2024-09-03', 'xxx', '出勤/缺勤'])
}else if (this.tableName === 'course_contents') {
data.push(['(上传前请删除示例)', '', '', ''])
- data.push(['(请设置单元格格式为文本格式)2024-09-03', '上午13:00-14:00', '王老师', '《战略思维2》', '苏州大学', '老师简介'])
+ data.push(['2024-09-03', '上午13:00-14:00', '王老师', '《战略思维2》', '苏州大学', '老师简介'])
}else if(this.tableName === 'course_signs'){
data.push(['(请确保学员联系方式不为空)', '', '', ''])
}
diff --git a/src/views/config/components/addDonate.vue b/src/views/config/components/addDonate.vue
new file mode 100644
index 0000000..9e5cce3
--- /dev/null
+++ b/src/views/config/components/addDonate.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+ *就读班级:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/config/donate.vue b/src/views/config/donate.vue
new file mode 100644
index 0000000..eac8ce4
--- /dev/null
+++ b/src/views/config/donate.vue
@@ -0,0 +1,198 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index 2fdef66..8c69e54 100644
--- a/src/views/course/components/addCourse.vue
+++ b/src/views/course/components/addCourse.vue
@@ -261,7 +261,7 @@
-
+
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index 641430a..15f3ae6 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -23,46 +23,47 @@
{{student_info[item.field]?student_info[item.field]:''}}
-
+
本班职务
{{sign_result.position?sign_result.position:''}}
-
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+ {{item.value}}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
- {{item.value}}
-
-
-
-
-
-
@@ -296,9 +297,11 @@
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(",")
+ res.data.map(item => {
+ if(item.edit_input==='files'){
+ if (!this.base.isNull(item.value) && item.value.indexOf("/storage/files/") !== -1) {
+ item.submit_files = item.value.split(",")
+ }
}
// 处理自定义字段中是否 是个人用户信息
if (!this.student_info.hasOwnProperty(item.field)) {