zd 教师电子档案

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

 import request from '@/utils/request'
 
-// 通知列表
+// // 任务列表
+// export function listTeacherNotice(query) {
+//   return request({
+//     url: '/teacherFiles/notice/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// // 添加任务
+// export function addTeacherNotice(data) {
+//   return request({
+//     url: '/teacherFiles/notice',
+//     method: 'post',
+//     data: data
+//   })
+// }
+
+// // 信息发布
+// export function infoTeacherNotice(id) {
+//   return request({
+//     url: `/teacherFiles/notice/release/${id}`,
+//     method: 'put'
+//   })
+    
+// }
+
+
+// // 通知下档案查看|数据维护
+// export function getteacherNotice(query) {
+//   return request({
+//     url: '/teacherFiles/files/list',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
+// //老师查看档案详情
+// export function getNoticeInfo(query) {
+//   return request({
+//     url: '/teacherFiles/files/list',
+//       method: 'get',
+//     params: query
+//   })
+// }
+
+// //级部查看档案详情
+// export function getDepInfo(query) {
+//   return request({
+//     url: '/teacherFiles/files/list',
+//       method: 'get',
+//     params: query
+//   })
+// }
+
+// //查看档案详情
+// export function getFileTnfo(id) {
+//   return request({
+//     url: '/teacherFiles/files/'+id,
+//       method: 'get',
+//   })
+// }
+// // 同步档案
+// export function syncNotice(id) {
+//   return request({
+//     url: '/teacherFiles/files/synchronous/' + id,
+//     method: 'put'
+//   })
+// }
+
+// 添加任务
+export function addTeacherNotice(data) {
+  return request({
+    url: '/teacherFiles/notice',
+    method: 'post',
+    data: data
+  })
+}
+
+// 任务列表
 export function listTeacherNotice(query) {
   return request({
     url: '/teacherFiles/notice/list',
@@ -9,24 +88,54 @@ export function listTeacherNotice(query) {
   })
 }
 
-// 添加通知
-export function addTeacherNotice(data) {
+// 任务详情
+export function infoTeaNotice(id) {
+    return request({
+        url: `/teacherFiles/notice/${id}`,
+        method: 'put'
+    })
+}
+
+// 任务修改
+export function updateTask(data) {
   return request({
     url: '/teacherFiles/notice',
-    method: 'post',
+    method: 'put',
     data: data
   })
 }
 
-// 信息发布
+// 发布任务
 export function infoTeacherNotice(id) {
+    return request({
+        url: `/teacherFiles/notice/release/${id}`,
+        method: 'put'
+    })
+}
+
+// 任务撤回
+ export function taskRetracted(id) {
+    return request({
+      url: '/teacherFiles/notice/withdraw/' + id,
+      method: 'put'
+    })
+}
+  
+// 任务完成
+ export function taskCompleted(id) {
+    return request({
+      url: '/teacherFiles/notice/complete/' + id,
+      method: 'put'
+    })
+}
+
+// 任务删除
+export function delTaskInfo(id) {
   return request({
-    url: `/teacherFiles/notice/release/${id}`,
-    method: 'put'
+    url: '/teacherFiles/notice/' + id,
+    method: 'delete'
   })
-    
-} 
-
+}
 
 // 通知下档案查看|数据维护
 export function getteacherNotice(query) {
@@ -36,7 +145,6 @@ export function getteacherNotice(query) {
     params: query
   })
 }
-
 //老师查看档案详情
 export function getNoticeInfo(query) {
   return request({
@@ -54,7 +162,6 @@ export function getDepInfo(query) {
     params: query
   })
 }
-
 //查看档案详情
 export function getFileTnfo(id) {
   return request({
@@ -70,3 +177,43 @@ export function syncNotice(id) {
   })
 }
 
+// 教师档案修改
+export function updateInfo(data) {
+  return request({
+    url: '/teacherFiles/files',
+    method: 'put',
+    data: data
+  })
+}
+
+// 教师档案删除
+export function delInfo(id) {
+  return request({
+    url: '/teacherFiles/files' + id,
+    method: 'delete'
+  })
+}
+
+// 教师档案提交审核
+// /teacherFiles/files/submitTo/29
+export function fileSubReview(id) {
+    return request({
+        url: `/teacherFiles/files/submitTo/${id}`,
+        method: 'put'
+    })
+}
+
+// 教师档案提交通过
+export function fileSubApproved(id) {
+    return request({
+        url: `/teacherFiles/files/reject/${id}`,
+        method: 'put'
+    })
+}
+// 教师档案提交驳回
+export function fileSubRejected(id) {
+    return request({
+        url: `/teacherFiles/files/passThrough/${id}`,
+        method: 'put'
+    })
+}
\ No newline at end of file

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

@@ -16,7 +16,7 @@
         <el-select v-model="queryForm.noticeState" placeholder="请选择任务状态">
           <el-option label="未发布" value="1"></el-option>
           <el-option label="已发布" value="2"></el-option>
-          <el-option label="已结束" value="3"></el-option>
+          <el-option label="已结束" value="7"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -107,7 +107,13 @@
       >
         <template slot-scope="{ row }">
           {{
-            row.noticeState == 1 ? "未发布" : 2 ? "已发布" : 3 ? "已结束" : ""
+            row.noticeState == 1
+              ? "未发布"
+              : row.noticeState == 2
+              ? "已发布"
+              : row.noticeState == 7
+              ? "已发布"
+              : ""
           }}
         </template>
       </el-table-column>
@@ -142,16 +148,19 @@
             </el-button>
           </div>
           <div>
-            <!-- v-if="scope.row.noticeState == '2'" -->
-            <el-button size="mini" type="text" @click="dataReceiver(scope.row)"
+            <el-button
+              v-if="scope.row.noticeState == '2'"
+              size="mini"
+              type="text"
+              @click="dataReceiver(scope.row)"
               >数据接收人员
             </el-button>
             <el-button
+              v-if="scope.row.noticeState == '2'"
               size="mini"
               type="text"
               @click="dataMaintenance(scope.row)"
               >数据维护
-              <!--  v-if="scope.row.noticeState == '2'" -->
             </el-button>
             <el-button
               v-if="scope.row.noticeState == '2'"
@@ -177,21 +186,21 @@
           </div>
           <div>
             <el-button
-              v-if="scope.row.noticeState == '3'"
+              v-if="scope.row.noticeState == '7'"
               size="mini"
               type="text"
               @click="dataReceiver(scope.row)"
               >数据接收人员
             </el-button>
             <el-button
-              v-if="scope.row.noticeState == '3'"
+              v-if="scope.row.noticeState == '7'"
               size="mini"
               type="text"
               @click="dataMaintenance(scope.row)"
               >数据查看
             </el-button>
             <el-button
-              v-if="scope.row.noticeState == '3'"
+              v-if="scope.row.noticeState == '7'"
               size="mini"
               type="text"
               @click="handleExport(scope.row)"
@@ -272,13 +281,24 @@
 
 <script>
 import {
-  listTeacherNotice, // 通知列表
-  addTeacherNotice, // 添加通知
-  infoTeacherNotice, // 信息发布
+  addTeacherNotice, //添加任务
+  listTeacherNotice, // 任务列表
+  infoTeaNotice, //任务详情
+  updateTask, //添加修改
+  infoTeacherNotice, //发布任务
+  taskRetracted, //任务撤回
+  taskCompleted, //任务完成
+  delTaskInfo, //任务删除
   getteacherNotice, // 通知下档案查看|数据维护
-  getNoticeInfo, //查看档案详情//查看档案详情
-  syncNotice, // 同步档案
-  getDepInfo, //级部查询列表
+  getNoticeInfo, //老师查看档案详情
+  getDepInfo, //级部查看档案详情
+  getFileTnfo, //查看档案详情
+  syncNotice, //同步档案
+  updateInfo, //教师档案修改
+  delInfo, //教师档案删除
+  fileSubReview, //教师档案提交审核
+  fileSubApproved, //教师档案提交通过
+  fileSubRejected, //教师档案提交驳回
 } from "@/api/smartSchool/teacherFiles/teacherElectronicFile";
 import { format } from "@/utils/activiti/myUtil.js";
 export default {
@@ -309,6 +329,7 @@ export default {
       // 弹窗标题
       title: "",
       form: {
+        noticeYear: "",
         noticeSemester: "",
         noticeRange: "全体教师",
         startTime: "",
@@ -374,11 +395,30 @@ export default {
       this.dialogVisible = true;
     },
     //弹窗确定按钮
+
     confirmDialog() {
-      addTeacherNotice(this.form).then((res) => {
-        console.log(res, "弹窗确定");
-        this.dialogVisible = false;
-        this.getList();
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            // 修改
+            updateTask(this.form)
+              .then((response) => {
+                this.getList();
+                this.$message.success("修改成功");
+                this.dialogVisible = false;
+              })
+              .catch((err) => {});
+          } else {
+            // 新增
+            addTeacherNotice(this.form)
+              .then((response) => {
+                this.getList();
+                this.$message.success("新增成功");
+                this.dialogVisible = false;
+              })
+              .catch((err) => {});
+          }
+        }
       });
     },
     //多选删除按钮
@@ -388,25 +428,39 @@ export default {
     },
     //修改按钮
     handleEdit(row) {
+      console.log(row, "row1");
       this.title = "修改任务";
-
       this.dialogVisible = true;
+      this.form = row;
     },
     // 删除按钮
-    handleDelete(row) {},
+    handleDelete(row) {
+      const ids = row.id;
+      this.$modal
+        .confirm("是否确认删除？")
+        .then(function () {
+          return delTaskInfo(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
     //  发布按钮
     handlePublish(row) {
       this.$modal
-        .confirm("是否确认发布此信息？")
-        .then(() => {
+        .confirm("是否发布该活动？")
+        .then(function () {
           return infoTeacherNotice(row.id);
+          console.log(row, "发布按钮");
         })
         .then(() => {
           this.getList();
           this.$modal.msgSuccess("发布成功");
         })
-        .catch((exception) => {
-          throw new Error(exception);
+        .catch((err) => {
+          console.error(err);
         });
     },
     //  数据接收人员按钮
@@ -442,11 +496,46 @@ export default {
       console.log(pageSize, "数据维护按钮size");
     },
     //  导出按钮
-    handleExport(row) {},
+    handleExport(row) {
+      //     this.download(`/artExam/exportAddress/${this.examId}`, {
+      //     ...this.queryParams
+      //   }, `教师电子档案${Date.now()}.xlsx`)
+    },
     //  撤回按钮
-    handleRevocation(row) {},
+    handleRevocation(row) {
+      // taskRetracted
+
+      this.$modal
+        .confirm("是否撤回该活动？")
+        .then(function () {
+          return taskRetracted(row.id);
+          console.log(row, "撤回按钮");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("撤回成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     //  结束按钮
-    handleFinish(row) {},
+    handleFinish(row) {
+      // taskCompleted
+      this.$modal
+        .confirm("是否结束该活动？")
+        .then(function () {
+          return taskCompleted(row.id);
+          console.log(row, "结束按钮");
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("任务结束");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
   },
 };
 </script>