Merge branch 'master' of 49.232.152.146:qangqi/dd_school

ruoyi-ui/src/api/smartSchool/teacherFiles/teacherElectronicFile.js

@@ -75,6 +75,14 @@ export function getteacherNotice(query) {
     params: query,
   });
 }
+// 级部列表
+export function getGradeTnfo(query) {
+  return request({
+    url: '/teacherFiles/files/gradeList',
+    method: 'get',
+    params: query
+  })
+}
 //老师查看详情
 export function getNoticeInfo(query) {
   return request({
@@ -85,14 +93,12 @@ export function getNoticeInfo(query) {
 }
 
 //老师查看列表
-export function getTeacherTnfo(userId) {
+export function getTeacherTnfo(query) {
   return request({
-    url: `/teacherFiles/files/getTeachList/${userId}`,
-    method: "get",
-    params: {
-      noticeName: noticeName,
-    },
-  });
+    url: '/teacherFiles/files/getTeachList',
+      method: 'get',
+      params: query
+  })
 }
 
 //级部查看档案详情
@@ -144,14 +150,14 @@ export function fileSubReview(id) {
   });
 }
 
-// 教师档案提交通过
+// 教师档案驳回
 export function fileSubApproved(id) {
   return request({
     url: `/teacherFiles/files/reject/${id}`,
     method: "put",
   });
 }
-// 教师档案提交驳回
+// 教师档案提交
 export function fileSubRejected(id) {
   return request({
     url: `/teacherFiles/files/passThrough/${id}`,

ruoyi-ui/src/views/smartSchool/gradeWork/electronicRecord/index.vue

@@ -8,7 +8,7 @@
       class="demo-form-inline"
     >
       <el-form-item label="姓名">
-        <el-input v-model="queryForm.name"></el-input>
+        <el-input v-model="queryForm.teacherName"></el-input>
       </el-form-item>
       <el-form-item label="任务名称">
         <el-select clearable v-model="queryForm.noticeName" style="width: 100%">
@@ -40,15 +40,15 @@
       <el-row :gutter="10">
         <el-col :span="1.5">
           <span>总计：</span>
-          <span style="font-size: 14px">120</span>
+          <span style="font-size: 14px">{{ this.total }}</span>
         </el-col>
         <el-col :span="1.5">
           <span>已填写：</span>
-          <span style="font-size: 14px">60</span>
+          <span style="font-size: 14px">{{ completedCount }}</span>
         </el-col>
         <el-col :span="1.5">
           <span>已确认：</span>
-          <span style="font-size: 14px">60</span>
+          <span style="font-size: 14px">{{ confirmedCount }}</span>
         </el-col>
       </el-row>
     </el-form>
@@ -58,6 +58,7 @@
       border
       :data="tableData"
       @selection-change="handleSelectionChange"
+      @cell-dblclick="handleCheck"
     >
       <el-table-column type="selection" width="55" :selectable="selectable">
         <template> </template>
@@ -66,74 +67,87 @@
       <el-table-column
         label="是否填写"
         align="center"
-        prop="schoolYear"
+        prop="state"
         min-width="200"
-      />
-      <el-table-column
+      >
+        <template slot-scope="{ row }">
+          {{
+            row.state == 1
+              ? "未发布"
+              : row.state == 2
+              ? "已发布"
+              : row.state == 3
+              ? "已填写"
+              : row.state == 4
+              ? "已提交"
+              : row.state == 5
+              ? "已确认"
+              : row.state == 9
+              ? "驳回"
+              : ""
+          }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
         label="任务名称"
         align="center"
         prop="noticeName"
         min-width="150"
-      />
+      /> -->
       <el-table-column
         label="学年学期"
         align="center"
-        prop="level"
+        prop="filesSemester"
         min-width="150"
       />
       <el-table-column
         label="级部"
         align="center"
         min-width="150"
-        prop="name"
+        prop="gradeName"
       />
       <el-table-column
         label="姓名"
         align="center"
         min-width="200"
-        prop="IDNum"
-      />
-      <el-table-column
-        label="年龄"
-        align="center"
-        min-width="150"
-        prop="schedule"
+        prop="teacherName"
       />
+      <el-table-column label="年龄" align="center" min-width="150" prop="age" />
       <el-table-column
         label="职称"
         align="center"
         min-width="150"
-        prop="schedule"
+        prop="title"
       />
       <el-table-column
         label="学历"
         align="center"
         min-width="150"
-        prop="schedule"
+        prop="education"
       />
       <el-table-column
         label="政治面貌"
         align="center"
         min-width="150"
-        prop="schedule"
+        prop="appearance"
       />
       <el-table-column
         label="任教学科"
         align="center"
         min-width="150"
-        prop="schedule"
+        prop="courseName"
       />
       <el-table-column
         label="任教班级"
         align="center"
         min-width="150"
-        prop="schedule"
+        prop="className"
       />
       <el-table-column
         label="任正班主任班级"
         align="center"
         min-width="150"
-        prop="schedule"
+        prop="bzrClassName"
       />
       <el-table-column
         fixed="right"
@@ -142,23 +156,38 @@
         min-width="200"
       >
         <template slot-scope="scope">
-          <!--已填写 未确认-->
+          <!-- 已发布 -->
           <div>
-            <el-button size="mini" type="text" @click="handleSubmit(scope.row)"
+            <el-button
+              v-if="scope.row.state <= 3"
+              size="mini"
+              type="text"
+              @click="handleSubmit(scope.row)"
               >提交
             </el-button>
-            <el-button size="mini" type="text" @click="handleReject(scope.row)"
+            <el-button
+              v-if="scope.row.state <= 3"
+              size="mini"
+              type="text"
+              @click="handleReject(scope.row)"
               >驳回
             </el-button>
-            <el-button size="mini" type="text" @click="handleEdit(scope.row)"
+            <el-button
+              v-if="scope.row.state <= 3"
+              size="mini"
+              type="text"
+              @click="handleEdit(scope.row)"
               >修改
             </el-button>
           </div>
-          <!--未填写，无按钮-->
-          <div></div>
-          <!--已确认 只查看-->
+          <!--已提交-->
           <div>
-            <el-button size="mini" type="text" @click="handleCheck(scope.row)"
+            <!-- v-if="scope.row.state == '5'" -->
+            <el-button
+              v-if="scope.row.state >= 3"
+              size="mini"
+              type="text"
+              @click="handleCheck(scope.row)"
               >查看
             </el-button>
           </div>
@@ -188,84 +217,99 @@
             label-width="120px"
           >
             <el-form-item label="学年学期:" style="padding-right: 10px">
-              <el-input readonly v-model="dialogForm.name"></el-input>
+              <el-input
+                :readonly="check == true ? true : false"
+                v-model="dialogForm.filesSemester"
+              ></el-input>
             </el-form-item>
             <el-form-item label="级部:" style="padding-right: 10px">
-              <el-input readonly v-model="dialogForm.name"></el-input>
+              <el-input
+                :readonly="check == true ? true : false"
+                v-model="dialogForm.gradeName"
+              ></el-input>
             </el-form-item>
             <el-form-item label="姓名:" style="padding-right: 10px">
-              <el-input readonly v-model="dialogForm.name"></el-input>
+              <el-input
+                :readonly="check == true ? true : false"
+                v-model="dialogForm.teacherName"
+              ></el-input>
             </el-form-item>
             <el-form-item label="性别:" style="padding-right: 10px">
-              <el-input readonly v-model="dialogForm.name"></el-input>
+              <el-input
+                :readonly="check == true ? true : false"
+                v-model="dialogForm.sex"
+              ></el-input>
             </el-form-item>
             <el-form-item label="年龄:" style="padding-right: 10px">
-              <el-input readonly v-model="dialogForm.name"></el-input>
+              <el-input
+                :readonly="check == true ? true : false"
+                v-model="dialogForm.age"
+              ></el-input>
             </el-form-item>
             <el-form-item label="职称:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.title"
               ></el-input>
             </el-form-item>
             <el-form-item label="学历:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.education"
               ></el-input>
             </el-form-item>
             <el-form-item label="政治面貌:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.appearance"
               ></el-input>
             </el-form-item>
             <el-form-item label="任教学科:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.courseName"
               ></el-input>
             </el-form-item>
             <el-form-item label="任教班级:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.className"
               ></el-input>
             </el-form-item>
             <el-form-item label="任正班主任班级:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.bzrClassName"
               ></el-input>
             </el-form-item>
             <el-form-item label="任副班主任班级:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.fbzrClassName"
               ></el-input>
             </el-form-item>
             <el-form-item label="是否教学组长:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.isTeachingGroupLeader"
               ></el-input>
             </el-form-item>
             <el-form-item label="是否教研组长:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.isResearchGroupLeader"
               ></el-input>
             </el-form-item>
             <el-form-item label="设计课时量:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.classHour"
               ></el-input>
             </el-form-item>
             <el-form-item label="班主任情况:" style="padding-right: 10px">
               <el-input
                 :readonly="check == true ? true : false"
-                v-model="dialogForm.name"
+                v-model="dialogForm.classTeacherDetails"
               ></el-input>
             </el-form-item>
           </el-form>
@@ -299,6 +343,7 @@
               type="success"
               size="mini"
               style="float: right; margin-right: 50px; margin-top: 10px"
+              @click="handleExtract"
               >提 取
             </el-button>
           </div>
@@ -311,13 +356,29 @@
               <el-table :data="tableFirstData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="论文名称">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.thesisName"
+                  label="论文名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="province" label="级别">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.level"
+                  label="级别"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="city" label="等级">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.grade"
+                  label="等级"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="发表时间">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.publishTime"
+                  label="发表时间"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件">
                   <template slot-scope="scope">
@@ -336,9 +397,17 @@
               <el-table :data="tableSecondData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="名称">
+                <el-table-column
+                  align="center"
+                  prop="materialList.name"
+                  label="名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="发表时间">
+                <el-table-column
+                  align="center"
+                  prop="materialList.publishTime"
+                  label="发表时间"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件">
                   <template slot-scope="scope">
@@ -350,16 +419,28 @@
             <div class="tableThird">
               <div class="tableTitle">
                 <i class="el-icon-data-analysis"></i>
-                <span style="margin-left: 5px">发表成就奖论文情况</span>
+                <span style="margin-left: 5px">培训情况</span>
               </div>
               <el-table :data="tableThirdData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="培训时间">
+                <el-table-column
+                  align="center"
+                  prop="trainingList.trainingTime"
+                  label="培训时间"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="培训名称">
+                <el-table-column
+                  align="center"
+                  prop="trainingList.trainingName"
+                  label="培训名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="是否合格">
+                <el-table-column
+                  align="center"
+                  prop="trainingList.isQualified"
+                  label="是否合格"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件">
                   <template slot-scope="scope">
@@ -371,18 +452,34 @@
             <div class="tableForth">
               <div class="tableTitle">
                 <i class="el-icon-trophy"></i>
-                <span style="margin-left: 5px">发表成就奖论文情况</span>
+                <span style="margin-left: 5px">业务获奖情况</span>
               </div>
               <el-table :data="tableForthData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="name" label="获奖名称">
+                <el-table-column
+                  align="center"
+                  prop="awardList.awardName"
+                  label="获奖名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="获奖时间">
+                <el-table-column
+                  align="center"
+                  prop="awardList.awardTime"
+                  label="获奖时间"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="获奖等级">
+                <el-table-column
+                  align="center"
+                  prop="awardList.gradeOfAward"
+                  label="获奖等级"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="address" label="发证机关">
+                <el-table-column
+                  align="center"
+                  prop="awardList.licenseIssuingAuthority"
+                  label="发证机关"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件">
                   <template slot-scope="scope">
@@ -418,11 +515,14 @@ import {
   fileSubReview, //教师档案提交审核
   fileSubApproved, //教师档案提交通过
   fileSubRejected, //教师档案提交驳回
+  getGradeTnfo, //级部列表查询
 } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
 export default {
   name: "gradeElectronicRecord",
   data() {
     return {
+      completedCount: "", //填写
+      confirmedCount: "", //确认
       listTeacherInfo: [],
       // 遮罩层
       loading: true,
@@ -432,7 +532,7 @@ export default {
         pageSize: 10,
         pageNum: 1,
         noticeName: "",
-        name: "",
+        teacherName: "",
       },
       tableData: [],
       dialogVisible: false,
@@ -457,8 +557,6 @@ export default {
     };
   },
   mounted() {
-    // console.log("id", this.$route.query.id);
-    // console.log("status", this.status);
     this.getList();
     this.getListInfo();
   },
@@ -468,31 +566,44 @@ export default {
       const params = {
         pageNum: this.queryForm.pageNum,
         pageSize: this.queryForm.pageSize,
-        noticeId: 2,
+        noticeState: 2,
       };
+      const codePromise = new Promise((resolve) => {
         listTeacherNotice(params).then((res) => {
-        console.log(res, "列表");
           this.listTeacherInfo = res.rows;
-        console.log(this.listTeacherInfo, "this.listTeacherInfo");
+          resolve();
         });
+      });
+      return codePromise;
     },
+
     /** 查询信息列表 */
-    getList() {
+    async getList() {
       this.loading = true;
+      await this.getListInfo();
       const params = {
         pageNum: this.queryForm.pageNum,
         pageSize: this.queryForm.pageSize,
         gradeTeacherId: this.$store.state.user.userId,
-        noticeId: 2,
+        noticeId: this.queryForm.noticeName,
         noticeName: this.queryForm.noticeName,
-        name: this.queryForm.name,
+        teacherName: this.queryForm.teacherName,
       };
 
-      getNoticeInfo(params).then((res) => {
-        console.log(params, "params");
-        console.log(res, "查询res");
+      getGradeTnfo(params).then((res) => {
+        this.tableData = res.rows;
+        this.total = res.total;
+        this.completedCount = res.rows.filter(
+          (item) => item.state === 3
+        ).length;
+        this.confirmedCount = res.rows.filter(
+          (item) => item.state === 5
+        ).length;
+        // console.log(this.completedCount, "this.completedCount");
+        // console.log(this.confirmedCount, "this.confirmedCount");
       });
     },
+
     //  搜索按钮
     handleQuery() {
       this.queryForm.pageNum = 1;
@@ -503,45 +614,123 @@ export default {
       this.queryForm = {
         pageNum: 1,
         pageSize: 10,
-        level: "",
+        noticeName: "",
         name: "",
-        region: "",
       };
       this.handleQuery();
     },
     //多选
     handleSelectionChange(row) {
-      console.log("row", row);
       this.ids = row.map((item) => item.id);
-      console.log("this.ids", this.ids);
     },
     //是否可勾选
     selectable(row, index) {
-      if (row.schoolYear == "已填写，未确认") {
+      if (row.state !== "5") {
         return true;
       }
     },
     //多选提交
-    handleMutiSubmit() {},
+    handleMutiSubmit(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否提交该活动？")
+        .then(function () {
+          return fileSubApproved(ids);
+          console.log(row, "提交按钮");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("任务已提交");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     //查看按钮
-    handleCheck(row) {
+    handleCheck(row, column, event) {
       this.check = true;
       this.title = "基本信息查看";
       this.dialogVisible = true;
+      this.dialogForm = { ...row }; //Vue深拷贝
     },
+
     //修改按钮
     handleEdit(row) {
       this.check = false;
       this.title = "基本信息修改";
       this.dialogVisible = true;
+      //   this.dialogForm = row;
+      this.dialogForm = JSON.parse(JSON.stringify(row));
     },
+
     //提交按钮
-    handleSubmit(row) {},
+    handleSubmit(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否提交该活动？")
+        .then(function () {
+          return fileSubRejected(ids);
+          console.log(row, "提交按钮");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("任务已提交");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     //驳回按钮
-    handleReject(row) {},
+    handleReject(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm("是否提交该活动？")
+        .then(function () {
+          return fileSubApproved(ids);
+          console.log(row, "提交按钮");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("任务已提交");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+    // 提取 `
+    handleExtract() {
+      const id = this.form.id;
+      syncNotice(id).then((res) => {
+        this.tableFirstData = res;
+        this.tableSecondData = res;
+        this.tableThirdData = res;
+        this.tableForthData = res;
+      });
+    },
     //弹窗确定按钮
     confirmDialog() {
       this.dialogVisible = false;
+      const params = {
+        id: this.dialogForm.id,
+        sex: this.dialogForm.sex,
+        age: this.dialogForm.age,
+        title: this.dialogForm.title,
+        education: this.dialogForm.education,
+        appearance: this.dialogForm.appearance,
+        courseName: this.dialogForm.courseName,
+        className: this.dialogForm.className,
+        bzrClassName: this.dialogForm.bzrClassName,
+        fbzrClassName: this.dialogForm.fbzrClassName,
+        isTeachingGroupLeader: this.dialogForm.isTeachingGroupLeader,
+        isResearchGroupLeader: this.dialogForm.isResearchGroupLeader,
+        classHour: this.dialogForm.classHour,
+        classTeacherDetails: this.dialogForm.classTeacherDetails,
+        state: this.dialogForm.state,
+      };
+      updateInfo(params).then((res) => {
+        this.form = res;
+        this.getList();
+      });
     },
   },
 };

ruoyi-ui/src/views/smartSchool/massOrganization/clubRegistrationReview/index.vue

@@ -254,6 +254,7 @@ export default {
     },
     // 同意
     handleAgree(row) {
+      console.log(row, "同意row");
       this.$confirm("确定同意吗?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

ruoyi-ui/src/views/smartSchool/personWork/electronicRecord/index.vue

 <!--个人工作教师电子档案 -->
 <template>
   <div>
-    <el-form style="margin-top: 20px; margin-left: 20px" :inline="true" :model="queryForm" class="demo-form-inline">
+    <el-form
+      style="margin-top: 20px; margin-left: 20px"
+      :inline="true"
+      :model="queryForm"
+      class="demo-form-inline"
+    >
       <el-form-item label="任务名称:">
-        <el-input v-model="queryForm.noticeName" placeholder="请输入"></el-input>
+        <el-input
+          v-model="queryForm.noticeName"
+          placeholder="请输入"
+        ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button size="mini" icon="el-icon-search" type="primary" @click="handleQuery">搜索</el-button>
-        <el-button size="mini" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+        <el-button
+          size="mini"
+          icon="el-icon-search"
+          type="primary"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="mini" icon="el-icon-refresh" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table style="margin-top: 20px" border :data="tableData">
       <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="任务名称" align="center" prop="noticeName" min-width="200" />
-      <el-table-column label="任务状态" align="center" prop="noticeState" min-width="150">
+      <el-table-column
+        label="任务名称"
+        align="center"
+        prop="noticeName"
+        min-width="200"
+      />
+      <el-table-column
+        label="任务状态"
+        align="center"
+        prop="noticeState"
+        min-width="150"
+      >
         <template slot-scope="{ row }">
           {{
             row.noticeState == 1
@@ -26,7 +52,12 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="填写状态" align="center" min-width="150" prop="state">
+      <el-table-column
+        label="填写状态"
+        align="center"
+        min-width="150"
+        prop="state"
+      >
         <template slot-scope="{ row }">
           {{
             row.state == 1
@@ -47,37 +78,79 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" min-width="200" prop="startTime" />
-      <el-table-column label="结束时间" align="center" min-width="150" prop="endTime" />
-      <el-table-column fixed="right" label="操作" align="center" min-width="200">
+      <el-table-column
+        label="开始时间"
+        align="center"
+        min-width="200"
+        prop="startTime"
+      />
+      <el-table-column
+        label="结束时间"
+        align="center"
+        min-width="150"
+        prop="endTime"
+      />
+      <el-table-column
+        fixed="right"
+        label="操作"
+        align="center"
+        min-width="200"
+      >
         <template slot-scope="scope">
           <!--已发布 未填写/已驳回 已填写-->
           <div>
-            <el-button v-if="check === '1' ? true : false" size="mini" type="text" @click="handleEdit(scope.row)">填写
+            <el-button
+              v-if="check === '1' ? true : false"
+              size="mini"
+              type="text"
+              @click="handleEdit(scope.row)"
+              >填写
             </el-button>
-            <el-button v-if="check === '1' ? true : false" size="mini" type="text" @click="handleSubmit(scope.row)">提交
+            <el-button
+              v-if="check === '1' ? true : false"
+              size="mini"
+              type="text"
+              @click="handleSubmit(scope.row)"
+              >提交
             </el-button>
           </div>
           <!--已发布 未填写/已驳回 已填写-->
           <div>
-            <el-button v-if="check === '2' || check === '3' || check === '5' || check === '9'
+            <el-button
+              v-if="
+                check === '2' || check === '3' || check === '5' || check === '9'
                   ? true
                   : false
-              " size="mini" type="text" @click="handleEdit(scope.row)">修改
+              "
+              size="mini"
+              type="text"
+              @click="handleEdit(scope.row)"
+              >修改
             </el-button>
-            <el-button v-if="check == '4' ? true : false" size="mini" type="text" @click="handleSubmit(scope.row)">提交
+            <el-button
+              v-if="check == '4' ? true : false"
+              size="mini"
+              type="text"
+              @click="handleSubmit(scope.row)"
+              >提交
             </el-button>
           </div>
           <!--已结束 已填写 / 已结束 级部已确认-->
           <div>
-            <el-button size="mini" type="text" @click="handleCheck(scope.row)">查看
+            <el-button size="mini" type="text" @click="handleCheck(scope.row)"
+              >查看
             </el-button>
           </div>
         </template>
       </el-table-column>
     </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryForm.pageNum"
+      :limit.sync="queryForm.pageSize"
+      @pagination="getList"
+    />
     <!--弹窗-->
     <el-dialog :title="title" :visible.sync="dialogVisible" width="100%">
       <div style="display: flex">
@@ -86,79 +159,221 @@
             <span class="line"></span>
             <span class="title">基本信息</span>
           </div>
-          <el-form size="mini" ref="form" label-position="left" :model="form" label-width="120px">
-            <el-form-item label="学年学期:" style="padding-right: 10px" :disabled="true">
-              <el-input v-model="form.filesSemester" :disabled="status == '7' ? true : false"></el-input>
+          <el-form
+            size="mini"
+            ref="form"
+            label-position="left"
+            :model="form"
+            label-width="120px"
+          >
+            <el-form-item
+              label="学年学期:"
+              style="padding-right: 10px"
+              :disabled="true"
+            >
+              <el-input
+                v-model="form.filesSemester"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="级部:" style="padding-right: 10px">
-              <el-input v-model="form.gradeName" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="级部:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.gradeName"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="姓名:" style="padding-right: 10px">
-              <el-input v-model="form.teacherName" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="姓名:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.teacherName"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
             <!-- <el-form-item label="性别:" style="padding-right: 10px">
               <el-input v-model="form.sex"></el-input>
             </el-form-item> -->
-            <el-form-item :disabled="true" label="性别：" style="padding-right: 10px">
-              <el-select :disabled="status == '7' ? true : false" v-model="form.sex" placeholder="请输入性别"
-                style="width: 100%">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                  :value="dict.value">
+            <el-form-item
+              :disabled="true"
+              label="性别："
+              style="padding-right: 10px"
+            >
+              <el-select
+                :disabled="status == '7' ? true : false"
+                v-model="form.sex"
+                placeholder="请输入性别"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item :disabled="true" label="年龄:" style="padding-right: 10px">
-              <el-input v-model="form.age" :disabled="status == '7' ? true : false">
+            <el-form-item
+              :disabled="true"
+              label="年龄:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.age"
+                :disabled="status == '7' ? true : false"
+              >
               </el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="职称:" style="padding-right: 10px">
-              <el-input v-model="form.title" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="职称:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.title"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="学历:" style="padding-right: 10px">
-              <el-input v-model="form.education" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="学历:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.education"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="政治面貌:" style="padding-right: 10px">
-              <el-input v-model="form.appearance" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="政治面貌:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.appearance"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="任教学科:" style="padding-right: 10px">
-              <el-input v-model="form.courseName" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="任教学科:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.courseName"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="任教班级:" style="padding-right: 10px">
-              <el-input v-model="form.className" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="任教班级:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.className"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="任正班主任班级:" style="padding-right: 10px">
-              <el-input v-model="form.bzrClassName" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="任正班主任班级:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.bzrClassName"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="任副班主任班级:" style="padding-right: 10px">
-              <el-input v-model="form.fbzrClassName" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="任副班主任班级:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.fbzrClassName"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="是否教学组长:" style="padding-right: 10px">
-              <el-input v-model="form.isTeachingGroupLeader" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="是否教学组长:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.isTeachingGroupLeader"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="是否教研组长:" style="padding-right: 10px">
-              <el-input v-model="form.isResearchGroupLeader" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="是否教研组长:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.isResearchGroupLeader"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="设计课时量:" style="padding-right: 10px">
-              <el-input v-model="form.classHour" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="设计课时量:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.classHour"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
-            <el-form-item :disabled="true" label="班主任情况:" style="padding-right: 10px">
-              <el-input v-model="form.classTeacherDetails" :disabled="status == '7' ? true : false"></el-input>
+            <el-form-item
+              :disabled="true"
+              label="班主任情况:"
+              style="padding-right: 10px"
+            >
+              <el-input
+                v-model="form.classTeacherDetails"
+                :disabled="status == '7' ? true : false"
+              ></el-input>
             </el-form-item>
           </el-form>
-          <span style="display: flex; justify-content: center" slot="footer" class="dialog-footer">
+          <span
+            style="display: flex; justify-content: center"
+            slot="footer"
+            class="dialog-footer"
+          >
             <div v-if="check == false">
-              <el-button size="small" type="primary" @click="confirmDialog">保 存</el-button>
-              <el-button size="small" @click="dialogVisible = false">取 消</el-button>
+              <el-button size="small" type="primary" @click="confirmDialog"
+                >保 存</el-button
+              >
+              <el-button size="small" @click="dialogVisible = false"
+                >取 消</el-button
+              >
             </div>
-            <el-button v-else type="primary" size="small" @click="dialogVisible = false">关 闭</el-button>
+            <el-button
+              v-else
+              type="primary"
+              size="small"
+              @click="dialogVisible = false"
+              >关 闭</el-button
+            >
           </span>
         </div>
         <div class="rightContent">
           <div style="margin-bottom: 10px">
             <span class="line"></span>
             <span class="title">教育科研</span>
-            <el-button :disabled="status == '7' ? true : false" type="success" size="mini"
-              style="float: right; margin-right: 50px; margin-top: 10px" @click="handleExtract">提 取
+            <el-button
+              :disabled="status == '7' ? true : false"
+              type="success"
+              size="mini"
+              style="float: right; margin-right: 50px; margin-top: 10px"
+              @click="handleExtract"
+              >提 取
             </el-button>
           </div>
           <div class="tableList">
@@ -170,13 +385,29 @@
               <el-table :data="tableFirstData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="thesisList.thesisName" label="论文名称">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.thesisName"
+                  label="论文名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="thesisList.level" label="级别">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.level"
+                  label="级别"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="thesisList.grade" label="等级">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.grade"
+                  label="等级"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="thesisList.publishTime" label="发表时间">
+                <el-table-column
+                  align="center"
+                  prop="thesisList.publishTime"
+                  label="发表时间"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件">
                   <!-- <template slot-scope="scope">
@@ -188,14 +419,24 @@
             <div class="tableSecond">
               <div class="tableTitle">
                 <i class="el-icon-edit-outline"></i>
-                <span style="margin-left: 5px">课题、结题、专著、校本教材编写情况</span>
+                <span style="margin-left: 5px"
+                  >课题、结题、专著、校本教材编写情况</span
+                >
               </div>
               <el-table :data="tableSecondData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="materialList.name" label="名称">
+                <el-table-column
+                  align="center"
+                  prop="materialList.name"
+                  label="名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="materialList.publishTime" label="发表时间">
+                <el-table-column
+                  align="center"
+                  prop="materialList.publishTime"
+                  label="发表时间"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件"> </el-table-column>
               </el-table>
@@ -208,11 +449,23 @@
               <el-table :data="tableThirdData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="trainingList.trainingTime" label="培训时间">
+                <el-table-column
+                  align="center"
+                  prop="trainingList.trainingTime"
+                  label="培训时间"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="trainingList.trainingName" label="培训名称">
+                <el-table-column
+                  align="center"
+                  prop="trainingList.trainingName"
+                  label="培训名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="trainingList.isQualified" label="是否合格">
+                <el-table-column
+                  align="center"
+                  prop="trainingList.isQualified"
+                  label="是否合格"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件"> </el-table-column>
               </el-table>
@@ -225,13 +478,29 @@
               <el-table :data="tableForthData" border>
                 <el-table-column align="center" fixed type="index" label="序号">
                 </el-table-column>
-                <el-table-column align="center" prop="awardList.awardName" label="获奖名称">
+                <el-table-column
+                  align="center"
+                  prop="awardList.awardName"
+                  label="获奖名称"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="awardList.awardTime" label="获奖时间">
+                <el-table-column
+                  align="center"
+                  prop="awardList.awardTime"
+                  label="获奖时间"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="awardList.gradeOfAward" label="获奖等级">
+                <el-table-column
+                  align="center"
+                  prop="awardList.gradeOfAward"
+                  label="获奖等级"
+                >
                 </el-table-column>
-                <el-table-column align="center" prop="awardList.licenselssuingAuthority" label="发证机关">
+                <el-table-column
+                  align="center"
+                  prop="awardList.licenselssuingAuthority"
+                  label="发证机关"
+                >
                 </el-table-column>
                 <el-table-column align="center" label="附件"> </el-table-column>
               </el-table>
@@ -324,13 +593,32 @@ export default {
     /** 查询信息列表 */
     getList() {
       this.loading = true;
-      const userId = this.$store.state.user.userId;
-      const noticeName = this.queryForm.noticeName;
-      console.log(userId, 'userId');
-      console.log(noticeName, 'noticeName');
-      getTeacherTnfo(userId, noticeName).then((res) => {
+      //   const userName = this.$store.state.user;
+      //   const userId = this.$store.state.user.userId;
+      //   queryForm.noticeName
+      const params = {
+        userId: this.$store.state.user.userId,
+        noticeName: this.queryForm.noticeName,
+      };
+      //   const params = {
+      //     pageNum: this.queryForm.pageNum,
+      //     pageSize: this.queryForm.pageSize,
+      //     teacherId: this.$store.state.user.userId,
+      //   };
+      getTeacherTnfo(params).then((res) => {
         this.tableData = res.rows;
+        console.log(params, "params");
         console.log(res, "res");
+        this.total = res.total;
+        // =======
+        //       const userId = this.$store.state.user.userId;
+        //       const noticeName = this.queryForm.noticeName;
+        //       console.log(userId, 'userId');
+        //       console.log(noticeName, 'noticeName');
+        //       getTeacherTnfo(userId, noticeName).then((res) => {
+        //         this.tableData = res.rows;
+        //         console.log(res, "res");
+        // >>>>>>> 026f530da388d11c389acb34cb726a7be3a375cf
       });
     },
 
@@ -434,7 +722,7 @@ export default {
                 this.$message.success("修改成功");
                 this.dialogVisible = false;
               })
-              .catch((err) => { });
+              .catch((err) => {});
           } else {
             // 新增
             const params = {
@@ -462,7 +750,7 @@ export default {
                 this.$message.success("新增成功");
                 this.dialogVisible = false;
               })
-              .catch((err) => { });
+              .catch((err) => {});
           }
         }
       });