diff --git a/src/api/stuCQS/synchronous-data/sync-class.js b/src/api/stuCQS/synchronous-data/sync-class.js
index 2079d54..831850c 100644
--- a/src/api/stuCQS/synchronous-data/sync-class.js
+++ b/src/api/stuCQS/synchronous-data/sync-class.js
@@ -30,3 +30,11 @@ export function listBj(query) {
params: query
})
}
+// 新同步班级信息
+export function syncBjinfo(query) {
+ return request({
+ url: '/syncdata/synchronousClass',
+ method: 'post',
+ params:query
+ })
+}
diff --git a/src/api/stuCQS/synchronous-data/sync-stu.js b/src/api/stuCQS/synchronous-data/sync-stu.js
index c7faf57..01f01c7 100644
--- a/src/api/stuCQS/synchronous-data/sync-stu.js
+++ b/src/api/stuCQS/synchronous-data/sync-stu.js
@@ -16,3 +16,18 @@ export function syncStuinfo() {
method: 'post'
})
}
+//新查询学生信息列表
+export function listStudent(query) {
+ return request({
+ url: '/syncdata/getStudentInfo',
+ method: 'get',
+ params: query
+ })
+}
+// 新同步学生信息
+export function syncStudentInfo() {
+ return request({
+ url: '/syncdata/synchronousStudent',
+ method: 'post'
+ })
+}
diff --git a/src/views/poverty/povertyapply/xwjl.vue b/src/views/poverty/povertyapply/xwjl.vue
index 15a3e98..fd1d486 100644
--- a/src/views/poverty/povertyapply/xwjl.vue
+++ b/src/views/poverty/povertyapply/xwjl.vue
@@ -68,7 +68,7 @@
- (
+ (
{{ key }}
@@ -78,7 +78,7 @@
{{ value }}
- )
+ )
@@ -111,7 +111,7 @@
-
+
@@ -451,7 +451,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids
this.$modal
- .confirm('是否确认删除困难认定编号为"' + ids + '"的数据项?')
+ .confirm('是否确认删除困难认定编号为"' + ids + '"的数据项?')
.then(function () {
return delApply(ids)
})
@@ -464,7 +464,7 @@ export default {
handleRevoke(row) {
this.$modal
- .confirm('是否确认撤回该记录?')
+ .confirm('是否确认撤回该记录?')
.then(function () {
return revoke(row)
})
diff --git a/src/views/routine/classmetting/cadownload/index.vue b/src/views/routine/classmetting/cadownload/index.vue
index 3659b97..6bcde37 100644
--- a/src/views/routine/classmetting/cadownload/index.vue
+++ b/src/views/routine/classmetting/cadownload/index.vue
@@ -4,10 +4,15 @@
+
+
+
+
+
+ clearable filterable @change="handleChangeQuery">
{{ data.label }}
({{ data.children.length }})
@@ -16,13 +21,11 @@
+ @keyup.enter.native="handleQuery" />
+ placeholder="请选择班会时间" />
@@ -82,8 +85,7 @@
+ @pagination="getList" />
@@ -129,6 +131,7 @@
import { addClassMettingContent, delClassMettingContent, getClassMettingContent, listClassMettingContent, updateClassMettingContent } from '@/api/routine/classmeting/classMettingContent'
import { listClassMettingTheme } from '@/api/routine/theme/ClassMettingTheme'
import { getClassName } from '@/api/stuCQS/basedata/student'
+import { getDeptName } from '@/api/system/dept'
import AttachUpload from '@/components/AttachUpload'
export default {
name: 'ClassMettingContent',
@@ -160,6 +163,8 @@ export default {
title: '',
//班级列表
ClassNameList: [],
+ // 学院列表
+ deptList: [],
// 是否显示弹出层
open: false,
//班会主题内容
@@ -189,6 +194,7 @@ export default {
this.cmNo = this.$route.query.cmNo
this.getList()
this.getClassNameList()
+ this.getDeptList()
this.getClassTheme()
},
methods: {
@@ -220,6 +226,12 @@ export default {
this.ClassNameList = res.data
})
},
+ // 获取学院列表
+ getDeptList() {
+ getDeptName().then(response => {
+ this.deptList = response.data
+ })
+ },
// 取消按钮
cancel() {
this.open = false
@@ -323,7 +335,7 @@ export default {
this.getList()
})
} else {
- this.form.crCmNo = this.cmNo //加入编码,关联数据
+ this.form.crCmNo = this.cmNo //加入编码,关联数据
addClassMettingContent(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
@@ -336,7 +348,7 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const crIds = row.crId || this.ids
- this.$modal.confirm('是否确认删除班会内容编号为"' + crIds + '"的数据项?').then(function () {
+ this.$modal.confirm('是否确认删除班会内容编号为"' + crIds + '"的数据项?').then(function () {
return delClassMettingContent(crIds)
}).then(() => {
this.getList()
diff --git a/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue b/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue
new file mode 100644
index 0000000..278b606
--- /dev/null
+++ b/src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+ 搜索
+
+
+
+
+
+
+
+ 同步数据
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue
index 49b8692..2ac688a 100644
--- a/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue
+++ b/src/views/stuCQS/synchronous-data/sync-class/syncBj.vue
@@ -8,25 +8,27 @@
搜索
+
+
+
+
+
+
+
+ 同步数据
重置
-
- 导出
-
- 同步数据
-
-
-
-
+
-
+
+
@@ -36,7 +38,8 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue
index c99965c..a6829f0 100644
--- a/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue
+++ b/src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue
@@ -1,5 +1,15 @@
+
+
+
+
+
+ 搜索
+ 重置
+
+
同步数据
+
+
+
+
+
+
+
+
-
+
+