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

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()