Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

优化考核审核

Browse Source
This commit is contained in:
sk1551
2020-09-02 15:02:13 +08:00
parent e23d9b74a9
commit 5faade9386
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxzxkhgl/TsbzJxzxkhshController.java
View File

@ -103,12 +103,18 @@ public class TsbzJxzxkhshController extends BaseController {
if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("1")) { if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getXjshyj())&&tsbzJxzxkhsh.getXjshyj().equals("1")) {
tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setXjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("2"); 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")) { if(!schoolCommonController.isStringEmpty(tsbzJxzxkhsh.getQjshyj())&&tsbzJxzxkhsh.getQjshyj().equals("1")) {
tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); tsbzJxzxkhsh.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setStatus("9"); 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)); return toAjax(tsbzJxzxkhshService.updateTsbzJxzxkhsh(tsbzJxzxkhsh));

14
ruoyi-ui/src/views/jxzxkhgl/jxzxxxsh/index.vue
View File

@ -66,7 +66,7 @@
<el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jzxzkhshList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="编号" align="center" prop="id" /> <el-table-column label="聘任校" align="center" prop="tsbzJxjsjbxx.prdwmc" />
<el-table-column label="考核方案" align="center" prop="faid" :formatter="faFormat" /> <el-table-column label="考核方案" align="center" prop="faid" :formatter="faFormat" />
<el-table-column label="教师" align="center" prop="tsbzJxjsjbxx.name" /> <el-table-column label="教师" align="center" prop="tsbzJxjsjbxx.name" />
<el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" /> <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
@ -88,7 +88,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']" v-hasPermi="['jxzxkhgl:jxzxkhsh:remove']"
>删除</el-button> >退回</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -403,15 +403,11 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids;
this.$confirm( this.$confirm("是否确认该教师考核数据回退到聘任校?", "警告", {
'是否确认删除考核审核过程编号为"' + ids + '"的数据项?',
"警告",
{
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning",
} })
)
.then(function () { .then(function () {
return delJzxzkhsh(ids); return delJzxzkhsh(ids);
}) })