From 7cd2bbafc1a8448c9177520f48c8fed6f106cfff Mon Sep 17 00:00:00 2001
From: zhy <17877871893@163.com>
Date: Tue, 21 Oct 2025 19:11:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=A6=E5=8A=A1=E7=8F=AD=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/routine/classmetting/content/xw.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/routine/classmetting/content/xw.vue b/src/views/routine/classmetting/content/xw.vue
index 9934cc9..ddbfa0b 100644
--- a/src/views/routine/classmetting/content/xw.vue
+++ b/src/views/routine/classmetting/content/xw.vue
@@ -250,7 +250,7 @@
     methods: {
       downloadFile(row) {
         console.log(row)
-        this.$download.zip('/runtine/ClassMettingTheme/downloadFile/' + row.cmNo, row.cmTitle + '.zip')
+        this.$download.zip('/runtine/ClassMettingTheme/downloadXwFile/' + row.cmNo, row.cmTitle + '.zip')
       },
       doExport(row){
         this.download('runtine/ClassMettingTheme/exportXwSubmit/'+row.cmNo, {

From 679f7b7b15147519b91a5e91222f9ff320796e9a Mon Sep 17 00:00:00 2001
From: zhy <17877871893@163.com>
Date: Tue, 21 Oct 2025 22:37:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stuCQS/good/MeritStudentView.vue | 712 ++++++++++-----------
 1 file changed, 355 insertions(+), 357 deletions(-)

diff --git a/src/views/stuCQS/good/MeritStudentView.vue b/src/views/stuCQS/good/MeritStudentView.vue
index 48b84ac..f949092 100644
--- a/src/views/stuCQS/good/MeritStudentView.vue
+++ b/src/views/stuCQS/good/MeritStudentView.vue
@@ -1,5 +1,6 @@
 <template>
-  <div v-loading.fullscreen.lock="fullLoading" :element-loading-text="loadingText" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.3)" class="app-container">
+  <div v-loading.fullscreen.lock="fullLoading" :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.3)" class="app-container">
 
     <div class="sign">
       <ol>
@@ -19,9 +20,7 @@
           参评学年各科平均学分绩75分以上（含75分），考查课“中等”及以上，平均学分绩班级排名前30%，学年综合素质测评班级排名前30%。
         </li>
         <li>
-          <span style="text-decoration: underline;color: lightskyblue;cursor: pointer;"
-                @click="lookMore"
-          >查看更多</span>
+          <span style="text-decoration: underline;color: lightskyblue;cursor: pointer;" @click="lookMore">查看更多</span>
         </li>
       </ol>
     </div>
@@ -31,9 +30,7 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addVClick">提交申请</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-view" size="mini"
-                   @click="myScoreVClick"
-        >查看我的成绩</el-button>
+        <el-button type="primary" plain icon="el-icon-view" size="mini" @click="myScoreVClick">查看我的成绩</el-button>
       </el-col>
     </el-row>
 
@@ -48,22 +45,17 @@
       <el-table-column label="提交时间" prop="applyTime" align="center" />
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="text" size="mini" icon="el-icon-view"
-                     @click="lookVClick(scope.row)"
-          >查看详情</el-button>
+          <el-button type="text" size="mini" icon="el-icon-view" @click="lookVClick(scope.row)">查看详情</el-button>
           <el-button v-if="scope.row.applyStatus == '1'" type="text" size="mini" icon="el-icon-close"
-                     @click="cancelVClick(scope.row)"
-          >取消申请</el-button>
+            @click="cancelVClick(scope.row)">取消申请</el-button>
           <el-button v-if="scope.row.applyStatus == '10'" type="text" size="mini" icon="el-icon-refresh"
-                     @click="refreshVClick(scope.row)"
-          >重新提交</el-button>
+            @click="refreshVClick(scope.row)">重新提交</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-                :limit.sync="queryParams.pageSize" @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
 
     <!-- 提交申请 -->
@@ -73,15 +65,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="政治面貌">
-              <el-input v-model="addForm.zzmm" size="mini" class="addForm-input"
-                        placeholder="请输入政治面貌(例如：群众、共青团员)"
-              />
+              <el-input v-model="addForm.zzmm" size="mini" class="addForm-input" placeholder="请输入政治面貌(例如：群众、共青团员)" />
             </el-form-item>
             <el-form-item label="第二课堂学分认定">
               <el-select v-model="addForm.classtwoSure" size="mini" placeholder="第二学分成绩认定">
-                <el-option v-for="item in options" :key="item.value" :label="item.label"
-                           :value="item.value"
-                />
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <!-- <el-form-item label="青年大学习学习率">
@@ -90,19 +78,15 @@
                         </el-form-item> -->
             <el-form-item label="职务">
               <el-input v-model="addForm.classPost" size="mini" class="addForm-input"
-                        placeholder="请输入职务(例如：班长，没有填 无)"
-              />
+                placeholder="请输入职务(例如：班长，没有填 无)" />
             </el-form-item>
             <el-form-item label="获奖情况">
               <el-input v-model="addForm.goodHis" type="textarea" :maxlength="1000"
-                        :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input" placeholder="请输入获奖情况"
-              />
+                :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input" placeholder="请输入获奖情况" />
             </el-form-item>
             <el-form-item label="主要事迹">
               <el-input v-model="addForm.mainHis" type="textarea" :maxlength="1000"
-                        :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
-                        placeholder="请输入主要事迹，字数100字以上"
-              />
+                :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input" placeholder="请输入主要事迹，字数100字以上" />
             </el-form-item>
             <el-form-item label="">
               <el-button type="primary" size="mini" @click="doApply">提交申请</el-button>
@@ -118,9 +102,7 @@
       <el-steps :active="getStep(lookForm)">
         <el-step title="学生提交申请" description="" />
 
-        <el-step title="辅导员审核"
-                 :status="isEmpty(lookForm.fdyComment) ? 'wait' : getStepStatus(lookForm.fdyComment)"
-        >
+        <el-step title="辅导员审核" :status="isEmpty(lookForm.fdyComment) ? 'wait' : getStepStatus(lookForm.fdyComment)">
           <template slot="description">
             <div>
               {{ isEmpty(lookForm.fdyNoName) ? '' : lookForm.fdyNoName }}
@@ -134,9 +116,7 @@
           </template>
         </el-step>
 
-        <el-step title="学院审核"
-                 :status="isEmpty(lookForm.deptComment) ? 'wait' : getStepStatus(lookForm.deptComment)"
-        >
+        <el-step title="学院审核" :status="isEmpty(lookForm.deptComment) ? 'wait' : getStepStatus(lookForm.deptComment)">
           <template slot="description">
             <div>
               {{ isEmpty(lookForm.deptNoName) ? '' : lookForm.deptNoName }}
@@ -150,9 +130,7 @@
           </template>
         </el-step>
 
-        <el-step title="学工审核"
-                 :status="isEmpty(lookForm.finalComment) ? 'wait' : getStepStatus(lookForm.finalComment)"
-        >
+        <el-step title="学工审核" :status="isEmpty(lookForm.finalComment) ? 'wait' : getStepStatus(lookForm.finalComment)">
           <template slot="description">
             <div>
               {{ isEmpty(lookForm.finalNoName) ? '' : lookForm.finalNoName }}
@@ -174,45 +152,36 @@
               <el-input v-model="lookForm.zzmm" size="mini" class="addForm-input" readonly />
             </el-form-item>
             <el-form-item label="职务">
-              <el-input v-model="lookForm.classPost" size="mini" class="addForm-input"
-                        readonly
-              />
+              <el-input v-model="lookForm.classPost" size="mini" class="addForm-input" readonly />
             </el-form-item>
             <!-- <el-form-item label="青年大学习学习率">
                             <el-input size="mini" class="addForm-input" v-model="lookForm.youthPercent"
                                 placeholder="请输入青年大学学习率，单位为%" readonly></el-input>
                         </el-form-item> -->
             <el-form-item label="第二课堂学分认定">
-              <el-input v-model="lookForm.classtwoSure" size="mini" class="addForm-input"
-                        readonly
-              />
+              <el-input v-model="lookForm.classtwoSure" size="mini" class="addForm-input" readonly />
             </el-form-item>
             <el-form-item label="获奖情况">
               <el-input v-model="lookForm.goodHis" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
-                        class="addForm-input" readonly
-              />
+                class="addForm-input" readonly />
             </el-form-item>
             <el-form-item label="主要事迹">
               <el-input v-model="lookForm.mainHis" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
-                        class="addForm-input" readonly
-              />
+                class="addForm-input" readonly />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item v-if="!isEmpty(lookForm.fdyComment)" label="辅导员审核意见">
               <el-input v-model="lookForm.fdyComment" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
-                        class="addForm-input" readonly
-              />
+                class="addForm-input" readonly />
             </el-form-item>
             <el-form-item v-if="!isEmpty(lookForm.deptComment)" label="学院审核意见">
               <el-input v-model="lookForm.deptComment" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
-                        class="addForm-input" readonly
-              />
+                class="addForm-input" readonly />
             </el-form-item>
             <el-form-item v-if="!isEmpty(lookForm.finalComment)" label="学工审核意见">
               <el-input v-model="lookForm.finalComment" type="textarea" :autosize="{ minRows: 10, maxRows: 10 }"
-                        class="addForm-input" readonly
-              />
+                class="addForm-input" readonly />
             </el-form-item>
           </el-col>
         </el-row>
@@ -254,8 +223,7 @@
       </el-table>
 
       <pagination v-show="courseTotal > 0" :total="courseTotal" :page.sync="courseParams.pageNum"
-                  :limit.sync="courseParams.pageSize" @pagination="listOwnScoreClassRank"
-      />
+        :limit.sync="courseParams.pageSize" @pagination="listOwnScoreClassRank" />
     </el-dialog>
 
     <el-dialog :visible.sync="lookMoreV">
@@ -270,14 +238,11 @@
           <el-col :span="24">
             <el-form-item label="政治面貌">
               <el-input v-model="refreshForm.zzmm" size="mini" class="addForm-input"
-                        placeholder="请输入政治面貌(例如：群众、共青团员)"
-              />
+                placeholder="请输入政治面貌(例如：群众、共青团员)" />
             </el-form-item>
             <el-form-item label="第二课堂学分认定">
               <el-select v-model="refreshForm.classtwoSure" size="mini" placeholder="第二学分成绩认定">
-                <el-option v-for="item in options" :key="item.value" :label="item.label"
-                           :value="item.value"
-                />
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
             <!-- <el-form-item label="青年大学习学习率">
@@ -286,19 +251,15 @@
                         </el-form-item> -->
             <el-form-item label="职务">
               <el-input v-model="refreshForm.classPost" size="mini" class="addForm-input"
-                        placeholder="请输入职务(例如：班长，没有填 无)"
-              />
+                placeholder="请输入职务(例如：班长，没有填 无)" />
             </el-form-item>
             <el-form-item label="获奖情况">
               <el-input v-model="refreshForm.goodHis" type="textarea" :maxlength="1000"
-                        :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input" placeholder="请输入获奖情况"
-              />
+                :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input" placeholder="请输入获奖情况" />
             </el-form-item>
             <el-form-item label="主要事迹">
               <el-input v-model="refreshForm.mainHis" type="textarea" :maxlength="1000"
-                        :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input"
-                        placeholder="请输入主要事迹，字数100字以上"
-              />
+                :autosize="{ minRows: 10, maxRows: 10 }" class="addForm-input" placeholder="请输入主要事迹，字数100字以上" />
             </el-form-item>
             <el-form-item label="">
               <el-button type="primary" size="mini" @click="reApply">提交申请</el-button>
@@ -318,8 +279,8 @@
 import { cancelOwnApply, reApply } from '@/api/stuCQS/good/apply'
 
 import {
-    goodStuApply, getMyApply, getMyGrade, verifyApplySHXS
-    , countOwnPassOther, listOwnScoreClassRankOther
+  goodStuApply, getMyApply, getMyGrade, verifyApplySHXS
+  , countOwnPassOther, listOwnScoreClassRankOther
 } from '@/api/stuCQS/good/MeritStudent'
 import { isEmpty } from '@/api/helpFunc'
 import lodash from 'lodash'
@@ -327,316 +288,353 @@ import MoreDetail from '@/views/stuCQS/good/MoreDetail.vue'
 
 
 export default {
-    name: 'MeritstudentApply',
-    dicts: ['audius_detail_type'],
-    components: {
-        MoreDetail
-    },
-    data() {
-        return {
-            isEmpty,
-            can_list: [],
-            addV: false,
-            addForm: {
-                zzmm: '',
-                classPost: '',
-                goodHis: '',
-                mainHis: '',
-                bornTime: '',
-                material: null,
-                classtwoSure: '',
-                youthPercent: '100'
-            },
-            term_list: [],
-            fullLoading: false,
+  name: 'MeritstudentApply',
+  dicts: ['audius_detail_type'],
+  components: {
+    MoreDetail
+  },
+  data() {
+    return {
+      isEmpty,
+      can_list: [],
+      addV: false,
+      addForm: {
+        zzmm: '',
+        classPost: '',
+        goodHis: '',
+        mainHis: '',
+        bornTime: '',
+        material: null,
+        classtwoSure: '',
+        youthPercent: '100'
+      },
+      term_list: [],
+      fullLoading: false,
 
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10
-            },
-            total: 0,
-            loading: false,
-            table_data: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      total: 0,
+      loading: false,
+      table_data: [],
 
-            lookV: false,
-            lookForm: {},
-            //附件
-            material_list: [],
-            count_list: [],//计数
-            score_list: [],//课程分数
-            Final_grade: [],//最终成绩
-            myScoreV: false,
-            courseTotal: 0,
-            courseParams: {
-                pageNum: 1,
-                pageSize: 10
-            },
-            course_loading: false,
+      lookV: false,
+      lookForm: {},
+      //附件
+      material_list: [],
+      count_list: [],//计数
+      score_list: [],//课程分数
+      Final_grade: [],//最终成绩
+      myScoreV: false,
+      courseTotal: 0,
+      courseParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      course_loading: false,
 
-            lookMoreV: false,
-            // 第二课堂学分认定
-            options: [
-                {
-                    value: '合格',
-                    label: '合格',
-                },
-                {
-                    value: '不合格',
-                    label: '不合格',
-                }
-            ],
-
-            refreshForm: {},
-            refreshV: false,
+      lookMoreV: false,
+      // 第二课堂学分认定
+      options: [
+        {
+          value: '合格',
+          label: '合格',
+        },
+        {
+          value: '不合格',
+          label: '不合格',
         }
+      ],
+
+      refreshForm: {},
+      refreshV: false,
+    }
+  },
+  created() {
+    this.listCan()
+    this.getList()
+    this.initTerm()
+  },
+  methods: {
+    getStepStatus(data) {
+      if ((data.includes('同意') && !data.includes('不同意')) || data.includes('通过') || (data.includes('符合') && !data.includes('不符合'))) {
+        return 'success'
+      } else {
+        return 'error'
+      }
     },
-    created() {
-        this.listCan()
+    getStep(data) {
+      if (!isEmpty(data.finalComment)) {
+        return 4
+      } else if (!isEmpty(data.deptComment)) {
+        return 3
+      } else if (!isEmpty(data.fdyComment)) {
+        return 2
+      } else {
+        return 1
+      }
+    },
+    async reApply() {
+      let sdata = { ...this.refreshForm }
+      if (isEmpty(sdata.zzmm)) {
+        this.$message.info('请填写政治面貌')
+        return
+      }
+      if (isEmpty(sdata.classPost)) {
+        this.$message.info('请填写职务')
+        return
+      }
+      // if (isEmpty(sdata.youthPercent)) {
+      // this.$message.info("请填写青年大学习学习率");
+      //return;
+      //}
+      if (isEmpty(sdata.classtwoSure)) {
+        this.$message.info('请填写第二课堂学分认定')
+        return
+      }
+
+      if (isEmpty(sdata.goodHis)) {
+        this.$message.info('请填写获奖记录')
+        return
+      }
+      if (isEmpty(sdata.mainHis)) {
+        this.$message.info('请填写主要事迹')
+        return
+      }
+      if (sdata.mainHis.length < 100) {
+        this.$message.info('主要事迹字数需要100字以上')
+        return
+      }
+
+
+      this.fullLoading = true
+      sdata.applyId = sdata.apply_id
+      let res = await reApply(sdata)
+      this.fullLoading = false
+      if (res.code == 200) {
+        this.refreshV = false
+        this.resetAddForm()
+        this.$message.success(res.msg)
         this.getList()
-        this.initTerm()
+      }
+    },
+    refreshVClick(v) {
+      this.refreshForm = { ...v }
+      this.refreshV = true
     },
-    methods: {
-        getStepStatus(data) {
-            if ((data.includes('同意') && !data.includes('不同意')) || data.includes('通过') || (data.includes('符合') && !data.includes('不符合'))) {
-                return 'success'
-            } else {
-                return 'error'
-            }
-        },
-        getStep(data) {
-            if (!isEmpty(data.finalComment)) {
-                return 4
-            } else if (!isEmpty(data.deptComment)) {
-                return 3
-            } else if (!isEmpty(data.fdyComment)) {
-                return 2
-            } else {
-                return 1
-            }
-        },
-        async reApply() {
-            let sdata = { ...this.refreshForm }
-            if (isEmpty(sdata.zzmm)) {
-                this.$message.info('请填写政治面貌')
-                return
-            }
-            if (isEmpty(sdata.classPost)) {
-                this.$message.info('请填写职务')
-                return
-            }
-            // if (isEmpty(sdata.youthPercent)) {
-            // this.$message.info("请填写青年大学习学习率");
-            //return;
-            //}
-            if (isEmpty(sdata.classtwoSure)) {
-                this.$message.info('请填写第二课堂学分认定')
-                return
-            }
 
-            if (isEmpty(sdata.goodHis)) {
-                this.$message.info('请填写获奖记录')
-                return
+    lookMore() {
+      this.lookMoreV = true
+      window.open('http://zhxg.gxsdxy.cn/file/pypxnotify.pdf')
+    },
+    cancelVClick(v) {
+      if (v != null) {
+        console.log(v)
+        let id = v.apply_id
+        if (!isEmpty(id)) {
+          this.$prompt('清输入取消理由', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            inputPattern: /^.+$/,
+            inputErrorMessage: '不能为空'
+          }).then(async ({ value }) => {
+            let sdata = {
+              id: id,
+              reason: value
             }
-            if (isEmpty(sdata.mainHis)) {
-                this.$message.info('请填写主要事迹')
-                return
-            }
-            if (sdata.mainHis.length < 100) {
-                this.$message.info('主要事迹字数需要100字以上')
-                return
-            }
-
-
             this.fullLoading = true
-            sdata.applyId = sdata.apply_id
-            let res = await reApply(sdata)
+            let res = await cancelOwnApply(sdata)
             this.fullLoading = false
             if (res.code == 200) {
-                this.refreshV = false
-                this.resetAddForm()
-                this.$message.success(res.msg)
-                this.getList()
-            }
-        },
-        refreshVClick(v) {
-            this.refreshForm = { ...v }
-            this.refreshV = true
-        },
-
-        lookMore() {
-            this.lookMoreV = true
-            window.open('http://zhxg.gxsdxy.cn/file/pypxnotify.pdf')
-        },
-        cancelVClick(v) {
-            if (v != null) {
-                console.log(v)
-                let id = v.apply_id
-                if (!isEmpty(id)) {
-                    this.$prompt('清输入取消理由', '提示', {
-                        confirmButtonText: '确定',
-                        cancelButtonText: '取消',
-                        inputPattern: /^.+$/,
-                        inputErrorMessage: '不能为空'
-                    }).then(async ({ value }) => {
-                        let sdata = {
-                            id: id,
-                            reason: value
-                        }
-                        this.fullLoading = true
-                        let res = await cancelOwnApply(sdata)
-                        this.fullLoading = false
-                        if (res.code == 200) {
-                            this.$message.success(res.msg)
-                            this.getList()
-                        }
-
-                    }).catch(() => {
-                        this.$message({
-                            type: 'info',
-                            message: '取消输入'
-                        })
-                    })
-
-                }
-            }
-        },
-        async listOwnScoreClassRank() {
-            this.course_loading = true
-            // 查询我的成绩
-            let res = await getMyGrade(this.courseParams)
-            let countRes = await countOwnPassOther()
-            let rankList = await listOwnScoreClassRankOther()
-            if (countRes.code == 200) {
-                this.count_list = [...countRes.data]
-            }
-            if (rankList.code == 200) {
-                this.Final_grade = [...rankList.data]
-            }
-            if (res.code == 200) {
-                this.score_list = lodash.cloneDeep(res.rows)
-                this.myScoreV = true
-                this.courseTotal = res.total
-            }
-            this.course_loading = false
-        },
-        async listOwnScoreClassRankS() {
-            this.course_loading = true
-            // 查询我的成绩
-            let res = await getMyGrade(this.courseParams)
-            this.course_loading = false
-            if (res.code == 200) {
-                this.score_list = lodash.cloneDeep(res.rows)
-                this.courseTotal = res.total
-            }
-        },
-
-
-        myScoreVClick() {
-            this.listOwnScoreClassRank()
-        },
-
-        lookVClick(v) {
-            console.log(v)
-            this.lookForm = lodash.cloneDeep(v)
-            if (!isEmpty(this.lookForm.material)) {
-                this.material_list = this.lookForm.material.split(',')
-            }
-            this.lookV = true
-        },
-
-
-        async getList() {
-            this.loading = true
-            let res = await getMyApply(this.queryParams)
-            this.loading = false
-
-            if (res.code == 200) {
-                this.table_data = lodash.cloneDeep(res.rows)
-            }
-        },
-
-
-        async listCan() {
-            // let res = await listXyjxjCanType();
-            // if (res.code == 200) {
-            //     this.can_list = lodash.cloneDeep(res.data);
-            // }
-        },
-        async initTerm() {
-            // let res1 = await listXyjxjCanType();
-            // if (res1.code == 200) {
-            //     let data = lodash.cloneDeep(res1.data);
-            //     if (!isEmpty(data) && data != []) {
-            //         let year = data[0].stuYearId;
-            //         let res2 = await listTermByYear(year);
-            //         if (res2.code == 200) {
-            //             this.term_list = lodash.cloneDeep(res2.data);
-            //         }
-            //     }
-            // }
-
-        },
-        async addVClick() {
-            this.loadingText = '提示：正在校验资格';
-            this.fullLoading = true;
-            try {
-                const verify = await verifyApplySHXS();
-                if (verify.code != 200) {
-                  this.$message && this.$message.warning(verify.msg || '未通过资格校验');
-                  return;
-                }
-                this.addV = true;
-                this.course_loading = true;
-                const res = await getMyGrade(this.courseParams);
-                const countRes = await countOwnPassOther();
-                const rankList = await listOwnScoreClassRankOther();
-                if (countRes.code == 200) {
-                  this.count_list = [...countRes.data];
-                }
-                if (rankList.code == 200) {
-                  this.Final_grade = [...rankList.data];
-                }
-                this.course_loading = false;
-                if (res.code == 200) {
-                  this.score_list = lodash.cloneDeep(res.rows);
-                  this.courseTotal = res.total;
-                }
-              } catch (e) {
-                this.$message && this.$message.error('校验失败，请稍后再试');
-              } finally {
-                this.fullLoading = false;
-                this.loadingText = '提示：处理中...';
-              }
-            },
-            // ... existing code ...
-            resetAddForm() {
-                this.addForm = {
-                    zzmm: '',
-                    classPost: '',
-                    goodHis: '',
-                    mainHis: '',
-                    bornTime: '',
-                    material: null
-                }
+              this.$message.success(res.msg)
+              this.getList()
             }
 
+          }).catch(() => {
+            this.$message({
+              type: 'info',
+              message: '取消输入'
+            })
+          })
+
+        }
+      }
+    },
+    async listOwnScoreClassRank() {
+      this.course_loading = true
+      // 查询我的成绩
+      let res = await getMyGrade(this.courseParams)
+      let countRes = await countOwnPassOther()
+      let rankList = await listOwnScoreClassRankOther()
+      if (countRes.code == 200) {
+        this.count_list = [...countRes.data]
+      }
+      if (rankList.code == 200) {
+        this.Final_grade = [...rankList.data]
+      }
+      if (res.code == 200) {
+        this.score_list = lodash.cloneDeep(res.rows)
+        this.myScoreV = true
+        this.courseTotal = res.total
+      }
+      this.course_loading = false
+    },
+    async listOwnScoreClassRankS() {
+      this.course_loading = true
+      // 查询我的成绩
+      let res = await getMyGrade(this.courseParams)
+      this.course_loading = false
+      if (res.code == 200) {
+        this.score_list = lodash.cloneDeep(res.rows)
+        this.courseTotal = res.total
+      }
+    },
+
+
+    myScoreVClick() {
+      this.listOwnScoreClassRank()
+    },
+
+    lookVClick(v) {
+      console.log(v)
+      this.lookForm = lodash.cloneDeep(v)
+      if (!isEmpty(this.lookForm.material)) {
+        this.material_list = this.lookForm.material.split(',')
+      }
+      this.lookV = true
+    },
+
+
+    async getList() {
+      this.loading = true
+      let res = await getMyApply(this.queryParams)
+      this.loading = false
+
+      if (res.code == 200) {
+        this.table_data = lodash.cloneDeep(res.rows)
+      }
+    },
+
+
+    async listCan() {
+      // let res = await listXyjxjCanType();
+      // if (res.code == 200) {
+      //     this.can_list = lodash.cloneDeep(res.data);
+      // }
+    },
+    async initTerm() {
+      // let res1 = await listXyjxjCanType();
+      // if (res1.code == 200) {
+      //     let data = lodash.cloneDeep(res1.data);
+      //     if (!isEmpty(data) && data != []) {
+      //         let year = data[0].stuYearId;
+      //         let res2 = await listTermByYear(year);
+      //         if (res2.code == 200) {
+      //             this.term_list = lodash.cloneDeep(res2.data);
+      //         }
+      //     }
+      // }
+
+    },
+    async addVClick() {
+      this.loadingText = '提示：正在校验资格';
+      this.fullLoading = true;
+      try {
+        const verify = await verifyApplySHXS();
+        if (verify.code != 200) {
+          this.$message && this.$message.warning(verify.msg || '未通过资格校验');
+          return;
+        }
+        this.addV = true;
+        this.course_loading = true;
+        const res = await getMyGrade(this.courseParams);
+        const countRes = await countOwnPassOther();
+        const rankList = await listOwnScoreClassRankOther();
+        if (countRes.code == 200) {
+          this.count_list = [...countRes.data];
+        }
+        if (rankList.code == 200) {
+          this.Final_grade = [...rankList.data];
+        }
+        this.course_loading = false;
+        if (res.code == 200) {
+          this.score_list = lodash.cloneDeep(res.rows);
+          this.courseTotal = res.total;
+        }
+      } catch (e) {
+        this.$message && this.$message.error('校验失败，请稍后再试');
+      } finally {
+        this.fullLoading = false;
+        this.loadingText = '提示：处理中...';
+      }
+    },
+    async doApply() {
+      let sdata = lodash.cloneDeep(this.addForm)
+      if (isEmpty(sdata.zzmm)) {
+        this.$message.info('请填写政治面貌')
+        return
+      }
+      // if (isEmpty(sdata.bornTime)) {
+      //     this.$message.info("请填写出生年月");
+      //     return;
+      // }
+      if (isEmpty(sdata.classPost)) {
+        this.$message.info('请填写职务')
+        return
+      }
+      if (isEmpty(sdata.goodHis)) {
+        this.$message.info('请填写获奖记录')
+        return
+      }
+      if (isEmpty(sdata.mainHis)) {
+        this.$message.info('请填写主要事迹')
+        return
+      }
+      if (sdata.mainHis.length < 100) {
+        this.$message.info('主要事迹字数需要100字以上')
+        return
+      }
+
+
+      this.fullLoading = true
+      let res = await goodStuApply(sdata)
+      this.fullLoading = false
+      if (res.code == 200) {
+        this.addV = false
+        this.resetAddForm()
+        this.$message.success(res.msg)
+        this.getList()
+      }
+    },
+    resetAddForm() {
+      this.addForm = {
+        zzmm: '',
+        classPost: '',
+        goodHis: '',
+        mainHis: '',
+        bornTime: '',
+        material: null
+      }
     }
+
+  }
 }
 </script>
 <style lang="scss" scoped>
 .addForm-input {
-    width: 400px;
+  width: 400px;
 }
 
 .el-form-item {
-    margin-bottom: 0px;
+  margin-bottom: 0px;
 }
 
 .sign {
-    width: 100%;
-    border: 1px solid rgb(163, 211, 255);
-    font-size: small;
-    margin-bottom: 10px;
-    border-radius: 2px;
+  width: 100%;
+  border: 1px solid rgb(163, 211, 255);
+  font-size: small;
+  margin-bottom: 10px;
+  border-radius: 2px;
 }
 </style>
\ No newline at end of file