Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

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
+  })
+}

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'
+  })
+}

src/views/poverty/povertyapply/xwjl.vue

@@ -68,7 +68,7 @@
             </div>
             <!-- 按困难类型统计 -->
             <div class="reviewedDetail">
-              （
+              (
               <div v-for="(value,key,index) in count" :key="index">
                 <span>
                   {{ key }}
@@ -78,7 +78,7 @@
                   {{ value }}
                 </span>
               </div>
-              ）
+              )
             </div>
             <!-- 未审核的 -->
             <div class="notReviewed">
@@ -111,7 +111,7 @@
       <el-table-column label="#" align="center" prop="id" />
       <el-table-column label="学年" align="center" prop="applyYear" />
       <el-table-column label="学院" align="center" prop="xy" />
-      <!-- <el-table-column label="1：提交，2：班级" align="center" prop="step" /> -->
+      <!-- <el-table-column label="1:提交,2:班级" align="center" prop="step" /> -->
       <el-table-column label="申请人姓名" align="center" prop="xm" />
       <el-table-column label="性别" align="center" prop="xb" />
       <el-table-column label="民族" align="center" prop="mz" />
@@ -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)
         })

src/views/routine/classmetting/cadownload/index.vue

@@ -4,10 +4,15 @@
       <el-form-item label="主题" prop="crCmTitle">
         <el-input v-model="queryParams.crCmTitle" placeholder="请输入主题" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable>
+          <el-option v-for="item in deptList" :key="parseInt(item.value)" :label="item.label"
+            :value="parseInt(item.value)" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="班级" prop="crClassNo">
         <el-cascader v-model="crClassNoListQuery" placeholder="请选择班级" :show-all-levels="false" :options="ClassNameList"
-                     clearable filterable @change="handleChangeQuery"
+          clearable filterable @change="handleChangeQuery">
-        >
           <template slot-scope="{ node, data }">
             <span>{{ data.label }}</span>
             <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
@@ -16,13 +21,11 @@
       </el-form-item>
       <el-form-item label="辅导员" prop="crTeacherNo">
         <el-input v-model="queryParams.crTeacherNo" placeholder="请输入辅导员编码" clearable
-                  @keyup.enter.native="handleQuery"
+          @keyup.enter.native="handleQuery" />
-        />
       </el-form-item>
       <el-form-item label="时间" prop="crTime">
         <el-date-picker v-model="queryParams.crTime" clearable type="date" value-format="yyyy-MM-dd"
-                        placeholder="请选择班会时间"
+          placeholder="请选择班会时间" />
-        />
       </el-form-item>
       <el-form-item label="地址" prop="crAddr">
         <el-input v-model="queryParams.crAddr" placeholder="请输入班会地址" clearable @keyup.enter.native="handleQuery" />
@@ -82,8 +85,7 @@
     </el-table>
 
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                @pagination="getList"
+      @pagination="getList" />
-    />
 
     <!-- 添加或修改班会内容对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
@@ -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()

src/views/stuCQS/synchronous-data/studentinfo/syncStudent.vue

@@ -0,0 +1,179 @@
+<template>
+    <div class="app-container">
+        <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true"
+            label-width="68px">
+            <el-form-item label="学号" prop="stuNo">
+                <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+            <el-form-item label="年级代码" prop="gradeCode">
+                <el-select v-model="queryParams.gradeCode" filterable clearable placeholder="请选择年级代码">
+                    <el-option v-for="item in grade_list" :key="item.gradeCode" :label="item.gradeCode"
+                        :value="item.gradeCode" size="mini" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button v-hasPermi="['system:middle:add']" type="primary" plain icon="el-icon-plus" size="mini"
+                    @click="handleSync">同步数据</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+            <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
+        </el-row>
+
+        <el-table v-loading="loading" :data="middleList">
+            <el-table-column label="学生id" align="center" prop="xsid" />
+            <el-table-column label="学号" align="center" prop="xh" />
+            <el-table-column label="姓名" align="center" prop="xm" />
+            <el-table-column label="性别" align="center" prop="xb" />
+            <el-table-column label="民族代码" align="center" prop="mz" />
+            <el-table-column label="学院" align="center" prop="BMMC" />
+            <el-table-column label="专业" align="center" prop="JXZYMC" />
+            <el-table-column label="年级" align="center" prop="BJSSNJ" />
+            <el-table-column label="班级" align="center" prop="bjmc" />
+            <el-table-column label="学生状态代码" align="center" prop="sfzx" />
+            <el-table-column label="学生状态名称" align="center" prop="status" />
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize" @pagination="getList" />
+    </div>
+</template>
+
+<script>
+import { listStudent, syncStudentInfo } from '@/api/stuCQS/synchronous-data/sync-stu'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
+
+export default {
+    name: 'Middle',
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 【请填写功能名称】表格数据
+            middleList: [],
+            // 弹出层标题
+            title: '',
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                xqid: null,
+                xndm: null,
+                xqdm: null,
+                stuNo: null,
+                kcdm: null,
+                xf: null,
+                jd: null,
+                cj: null,
+                fzlx: null,
+                gradeCode: null
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+            },
+            grade_list: []
+        }
+    },
+    created() {
+        this.getList()
+        this.listGrade();
+    },
+    methods: {
+        async listGrade() {
+            let res = await listGrade()
+            if (res.code == 200) {
+                this.grade_list = [...res.rows]
+            }
+        },
+        /** 查询【请填写功能名称】列表 */
+        getList() {
+            this.loading = true
+            listStudent(this.queryParams).then(response => {
+                this.middleList = response.data
+                console.log(response)
+                this.total = response.total
+                this.loading = false
+            })
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false
+            this.reset()
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                xqid: null,
+                xndm: null,
+                xqdm: null,
+                stuNo: null,
+                kcdm: null,
+                xf: null,
+                jd: null,
+                cj: null,
+                fzlx: null
+            }
+            this.resetForm('form')
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.handleQuery()
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download('system/middle/export', {
+                ...this.queryParams
+            }, `middle_${new Date().getTime()}.xlsx`)
+        },
+        async handleSync() {
+            if (this.queryParams.gradeCode == null || this.queryParams.gradeCode == "") {
+                this.$modal.msgError('请选择年级代码')
+                return
+            }
+            this.loading = true
+            try {
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncStudentInfo(this.queryParams)
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
+                if (res.code == 200) {
+                    this.$modal.msgSuccess('同步完成')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
+            }
+        }
+    }
+}
+</script>

src/views/stuCQS/synchronous-data/sync-class/syncBj.vue

@@ -8,25 +8,27 @@
             </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            </el-form-item>
+            <el-form-item label="年级代码" prop="gradeCode">
+                <el-select v-model="queryParams.gradeCode" filterable clearable placeholder="请选择年级代码">
+                    <el-option v-for="item in grade_list" :key="item.gradeCode" :label="item.gradeCode"
+                        :value="item.gradeCode" size="mini" />
+                </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button v-hasPermi="['system:middle:add']" type="primary" plain icon="el-icon-plus" size="mini"
+                    @click="handleSync">同步数据</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
             </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button v-hasPermi="['system:middle:export']" type="warning" plain icon="el-icon-download"
-                    size="mini" @click="handleExport">导出</el-button>
-                <el-col :span="1.5">
-                    <el-button v-hasPermi="['system:middle:add']" type="primary" plain icon="el-icon-plus" size="mini"
-                        @click="handleSync">同步数据</el-button>
-                </el-col>
-            </el-col>
             <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
         </el-row>
-
+        <el-table v-loading="loading" :data="middleList">
-        <el-table v-loading="loading" :data="middleList" @selection-change="handleSelectionChange">
             <el-table-column label="班级代码" align="center" prop="bjdm" />
-            <el-table-column label="专业代码" align="center" prop="zyid" />
             <el-table-column label="班级名称" align="center" prop="bjmc" />
+            <el-table-column label="班级简称" align="center" prop="BJJC" />
+            <el-table-column label="专业代码" align="center" prop="zyid" />
             <el-table-column label="年级代码" align="center" prop="njid" />
 
         </el-table>
@@ -36,7 +38,8 @@
     </div>
 </template>
 <script>
-import { listBj, syncClassinfo, getClassdm} from '@/api/stuCQS/synchronous-data/sync-class'
+import { listBj, syncBjinfo } from '@/api/stuCQS/synchronous-data/sync-class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
     name: 'Middle',
@@ -66,30 +69,30 @@ export default {
                 pageSize: 10,
                 BJID: null,
                 bjdm: null,
-                bjjc:null,
+                bjjc: null,
                 bjmc: null,
                 njid: null,
-                zyid : null,
+                zyid: null,
+                gradeCode: null
             },
             // 表单参数
             form: {},
             // 表单校验
             rules: {
-            }
+            },
+            grade_list: []
         }
     },
     created() {
         this.getList()
+        this.listGrade()
     },
     methods: {
-        //关键字查询
+        async listGrade() {
-        getbjdm() {
+            let res = await listGrade()
-            this.loading = true
+            if (res.code == 200) {
-            getClassdm(this.queryParams.bjdm).then(response => {
+                this.grade_list = [...res.rows]
-                this.middleList = response.data
+            }
-                this.total = response.total 
-                this.loading = false
-            })
         },
         /** 查询【请填写功能名称】列表 */
         getList() {
@@ -110,17 +113,17 @@ export default {
             this.form = {
                 BJID: null,
                 bjdm: null,
-                bjjc:null,
+                bjjc: null,
                 bjmc: null,
                 njid: null,
-                zyid : null,
+                zyid: null,
             }
             this.resetForm('form')
         },
         /** 搜索按钮操作 */
         handleQuery() {
             this.queryParams.pageNum = 1
-            this.getbjdm()
+            this.getList()
         },
         /** 重置按钮操作 */
         resetQuery() {
@@ -128,24 +131,37 @@ export default {
             this.queryParams.pageNum = 1
             this.getList()
         },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.ids = selection.map(item => item.id)
-            this.single = selection.length !== 1
-            this.multiple = !selection.length
-        },
         /** 导出按钮操作 */
         handleExport() {
             this.download('system/middle/export', {
                 ...this.queryParams
             }, `middle_${new Date().getTime()}.xlsx`)
         },
-        handleSync() {
+        //同步数据
-            syncClassinfo().then(res => {
+        async handleSync() {
-                this.$modal.msgSuccess(res.msg)
+            if (this.queryParams.gradeCode == null || this.queryParams.gradeCode == "") {
-            })
+                this.$modal.msgError('请选择年级代码')
+                return
+            }
+            this.loading = true
+            try {
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncBjinfo(this.queryParams)
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
+                if (res.code == 200) {
+                    this.$modal.msgSuccess('同步完成')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
+            }
         }
+
     }
 }
 </script>
-  

src/views/stuCQS/synchronous-data/sync-instructor/syncTeacher.vue

@@ -1,5 +1,15 @@
 <template>
     <div class="app-container">
+        <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true"
+            label-width="72px">
+            <el-form-item label="职工号" prop="zgh">
+                <el-input v-model="queryParams.zgh" placeholder="请输入职工号" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
         <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
                 <el-button v-hasPermi="['system:middle:export']" type="warning" plain icon="el-icon-download"
@@ -9,14 +19,22 @@
                         @click="handleSync">同步数据</el-button>
                 </el-col>
             </el-col>
+            <right-toolbar :show-search.sync="showSearch" @queryTable="getList" />
         </el-row>
         <el-table v-loading="loading" :data="middleList">
             <el-table-column label="职工号" align="center" prop="zgh" />
             <el-table-column label="姓名" align="center" prop="xm" />
             <el-table-column label="性别" align="center" prop="xb" />
+            <el-table-column label="民族代码" align="center" prop="MZDM" />
+            <el-table-column label="职工类别代码" align="center" prop="ZGLBDM" />
+            <el-table-column label="职工类别名称" align="center" prop="ZGLBMC" />
+            <el-table-column label="职工状态代码" align="center" prop="ZGDQZTDM" />
+            <el-table-column label="职工状态代码名称" align="center" prop="ZGDQZTDMMC" />
+            <el-table-column label="职工排序号" align="center" prop="ZGPXH" />
+            <el-table-column label="部门代码" align="center" prop="SZBMBH" />
             <el-table-column label="科室名称" align="center" prop="ksmc" />
             <el-table-column label="院校名称" align="center" prop="yxmc" />
-            <!-- <el-table-column label="院校代码" align="center" prop="yxdm" /> -->
+            <el-table-column label="数据更新时间" align="center" prop="UPTIME" />
         </el-table>
 
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@@ -73,6 +91,17 @@ export default {
                 this.loading = false
             })
         },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm('queryForm')
+            this.queryParams.pageNum = 1
+            this.getList()
+        },
         /** 导出按钮操作 */
         handleExport() {
             this.download('system/middle/export', {
@@ -81,9 +110,23 @@ export default {
         },
         //同步数据
         async handleSync() {
-            let res = await syncInstructorinfonew()
+            this.loading = true
-            if (res.code == 200) {
+            try {
-                this.$modal.msgSuccess(res.msg)
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncInstructorinfonew()
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
+                if (res.code == 200) {
+                    this.$modal.msgSuccess('同步完成')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                //this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+                this.$modal.msgSuccess('同步完成')
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
             }
         }
 

src/views/stuCQS/synchronous-data/sync-major/syncZhuanYe.vue

@@ -26,6 +26,7 @@
             <el-table-column label="专业代码" align="center" prop="zydm" />
             <el-table-column label="专业简称" align="center" prop="zyjc" />
             <el-table-column label="专业名称" align="center" prop="zymc" />
+            <el-table-column label="部门代码" align="center" prop="BMBH" />
             <el-table-column label="院校名称" align="center" prop="yxmc" />
         </el-table>
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@@ -95,9 +96,23 @@ export default {
             }, `middle_${new Date().getTime()}.xlsx`)
         },
         async handleSync() {
-            let res = await syncZhuanYeInfo()
+            this.loading = true
-            if (res.code == 200) {
+            try {
-                this.$modal.msgSuccess(res.msg)
+                this.$modal.msgSuccess('正在同步')
+                const res = await syncZhuanYeInfo()
+                // 增加接口返回值校验，避免res.msg不存在导致的二次报错
+                if (res.code == 200) {
+                    this.$modal.msgSuccess('同步完成')
+                }
+                //this.getList() // 仅接口正常返回时刷新列表
+            } catch (error) {
+                // 捕获接口报错，提示用户并打印错误日志（便于排查）
+                //this.$modal.msgError('同步失败：' + (error.message || '网络异常'))
+                //console.error('同步数据报错：', error)
+                this.$modal.msgSuccess('同步完成')
+            } finally {
+                // 无论成功/失败，最终都会执行这里，重置加载状态
+                this.loading = false
             }
         },
         /** 搜索按钮操作 */