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 21193469f..78f62bb34 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 @@ -103,12 +103,18 @@ public class TsbzJxzxkhshController extends BaseController { if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("1")) { tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setStatus("2"); + }else if (!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("0")) { + tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId()); + tsbzJxzxkhsh.setStatus("8"); } //区级 if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("1")) { tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setStatus("9"); + }else if (!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("0")) { + tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); + tsbzJxzxkhsh.setStatus("8"); } return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh)); diff --git a/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue b/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue index 73208620c..7c86b7de3 100644 --- a/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue +++ b/ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue @@ -66,7 +66,7 @@ - + @@ -88,7 +88,7 @@ icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']" - >删除 + >退回 @@ -403,23 +403,19 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$confirm( - '是否确认删除考核审核过程编号为"' + ids + '"的数据项?', - "警告", - { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - } - ) - .then(function() { + this.$confirm("是否确认该教师考核数据回退到聘任校?", "警告", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(function () { return delJzxzkhsh(ids); }) .then(() => { this.getList(); this.msgSuccess("删除成功"); }) - .catch(function() {}); + .catch(function () {}); } /** 导出按钮操作 */ // handleExport() {