From 96653048628f790aacd9c35bbc843cb5df78b66d Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Wed, 2 Sep 2020 12:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=81=E4=B9=A0=E4=B9=8B=E6=98=9F=E8=80=83?=
=?UTF-8?q?=E6=A0=B8-=E5=8C=BA=E7=BA=A7=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jxzxkhgl/TsbzJxzxkhshController.java | 4 +-
ruoyi-ui/src/views/jxjs/bsmd/index.vue | 4 +-
.../src/views/jxzxkhgl/jxzxqjsh/index.vue | 46 +++++++++----------
3 files changed, 26 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
index 0c5ada912..21193469f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
@@ -100,13 +100,13 @@ public class TsbzJxzxkhshController extends BaseController {
@PutMapping
public AjaxResult edit(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
//校级
- if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshjy())&&tsbzJxzxkhsh.getXjshjy().equals("1")) {
+ if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("1")) {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("2");
}
//区级
- if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshjy())&&tsbzJxzxkhsh.getQjshjy().equals("1")) {
+ if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("1")) {
tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("9");
}
diff --git a/ruoyi-ui/src/views/jxjs/bsmd/index.vue b/ruoyi-ui/src/views/jxjs/bsmd/index.vue
index 84bebdc21..cfa58707a 100644
--- a/ruoyi-ui/src/views/jxjs/bsmd/index.vue
+++ b/ruoyi-ui/src/views/jxjs/bsmd/index.vue
@@ -13,7 +13,7 @@
-
+
@@ -59,7 +59,7 @@
size="mini"
@click="handleExport"
v-hasPermi="['jxjs:jxjsjbxx:export']"
- >导出
+ >导出笔试名单
diff --git a/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
index eb43bd974..670b40347 100644
--- a/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
+++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxqjsh/index.vue
@@ -35,6 +35,16 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
清除
+ >退回
-
-
+
+
-
+
-
+
清除
+ >退回
@@ -340,15 +350,7 @@ export default {
if (this.form.id != null) {
updateJzxzkhsh(this.form).then((response) => {
if (response.code === 200) {
- this.msgSuccess("修改成功");
- this.open = false;
- this.getList();
- }
- });
- } else {
- addJzxzkhsh(this.form).then((response) => {
- if (response.code === 200) {
- this.msgSuccess("新增成功");
+ this.msgSuccess("审核成功");
this.open = false;
this.getList();
}
@@ -360,15 +362,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$confirm(
- '是否确认删除考核审核过程编号为"' + ids + '"的数据项?',
- "警告",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
+ this.$confirm("是否确认该教师考核数据回退到聘任校?", "警告", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning",
+ })
.then(function () {
return delJzxzkhsh(ids);
})