见习之星考核-见习教师提交

This commit is contained in:
paidaxing444 2020-09-01 15:12:17 +08:00
parent c5adeedd72
commit 3de15681dc
3 changed files with 135 additions and 32 deletions

View File

@ -2,6 +2,7 @@ package com.ruoyi.web.controller.jxzxkhgl;
import java.util.List; import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -36,7 +37,7 @@ public class TsbzJxzxkhshController extends BaseController {
/** /**
* 查询考核审核过程列表 * 查询考核审核过程列表
*/ */
@PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:list')") @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:list')" + "||@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(TsbzJxzxkhsh tsbzJxzxkhsh) { public TableDataInfo list(TsbzJxzxkhsh tsbzJxzxkhsh) {
startPage(); startPage();
@ -44,6 +45,17 @@ public class TsbzJxzxkhshController extends BaseController {
return getDataTable(list); return getDataTable(list);
} }
/**
* 查询考核审核过程列表
*/
@PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:list')" + "||@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:list')")
@GetMapping("/listbyfaid")
public TableDataInfo listByFaid(TsbzJxzxkhsh tsbzJxzxkhsh) {
tsbzJxzxkhsh.setCreateuseird(SecurityUtils.getLoginUser().getUser().getUserId());
List<TsbzJxzxkhsh> list = tsbzJxzxkhshService.selectTsbzJxzxkhshList(tsbzJxzxkhsh);
return getDataTable(list);
}
/** /**
* 导出考核审核过程列表 * 导出考核审核过程列表
*/ */
@ -68,10 +80,12 @@ public class TsbzJxzxkhshController extends BaseController {
/** /**
* 新增考核审核过程 * 新增考核审核过程
*/ */
@PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:add')") @PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:add')" + "||@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:edit')")
@Log(title = "考核审核过程", businessType = BusinessType.INSERT) @Log(title = "考核审核过程", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
public AjaxResult add(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) { public AjaxResult add(@RequestBody TsbzJxzxkhsh tsbzJxzxkhsh) {
tsbzJxzxkhsh.setJsid(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setCreateuseird(SecurityUtils.getLoginUser().getUser().getUserId());
return toAjax(tsbzJxzxkhshService.insertTsbzJxzxkhsh(tsbzJxzxkhsh)); return toAjax(tsbzJxzxkhshService.insertTsbzJxzxkhsh(tsbzJxzxkhsh));
} }
@ -94,4 +108,18 @@ public class TsbzJxzxkhshController extends BaseController {
public AjaxResult remove(@PathVariable Long[] ids) { public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(tsbzJxzxkhshService.deleteTsbzJxzxkhshByIds(ids)); return toAjax(tsbzJxzxkhshService.deleteTsbzJxzxkhshByIds(ids));
} }
/**
* 新增考核审核过程
*/
@PreAuthorize("@ss.hasPermi('jxzxkhgl:jxzxkhsh:add')" + "||@ss.hasPermi('jxzxkhgl:jxzxkhgcsj:edit')")
@Log(title = "考核审核过程", businessType = BusinessType.INSERT)
@PostMapping("/check/{id}")
public AjaxResult add(@PathVariable Long id) {
TsbzJxzxkhsh tsbzJxzxkhsh = new TsbzJxzxkhsh();
tsbzJxzxkhsh.setFaid(id);
tsbzJxzxkhsh.setJsid(SecurityUtils.getLoginUser().getUser().getUserId());
tsbzJxzxkhsh.setCreateuseird(SecurityUtils.getLoginUser().getUser().getUserId());
return toAjax(tsbzJxzxkhshService.insertTsbzJxzxkhsh(tsbzJxzxkhsh));
}
} }

View File

@ -2,52 +2,70 @@ import request from '@/utils/request'
// 查询考核审核过程列表 // 查询考核审核过程列表
export function listJzxzkhsh(query) { export function listJzxzkhsh(query) {
return request({ return request({
url: '/jxzxkhgl/jxzxkhsh/list', url: '/jxzxkhgl/jxzxkhsh/list',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询考核审核过程列表
export function listJzxzkhshByfaid(query) {
return request({
url: '/jxzxkhgl/jxzxkhsh/listbyfaid',
method: 'get',
params: query
})
}
// 查询考核审核过程详细 // 查询考核审核过程详细
export function getJzxzkhsh(id) { export function getJzxzkhsh(id) {
return request({ return request({
url: '/jxzxkhgl/jxzxkhsh/' + id, url: '/jxzxkhgl/jxzxkhsh/' + id,
method: 'get' method: 'get'
}) })
} }
// 新增考核审核过程 // 新增考核审核过程
export function addJzxzkhsh(data) { export function addJzxzkhsh(data) {
return request({ return request({
url: '/jxzxkhgl/jxzxkhsh', url: '/jxzxkhgl/jxzxkhsh',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改考核审核过程 // 修改考核审核过程
export function updateJzxzkhsh(data) { export function updateJzxzkhsh(data) {
return request({ return request({
url: '/jxzxkhgl/jxzxkhsh', url: '/jxzxkhgl/jxzxkhsh',
method: 'put', method: 'put',
data: data data: data
}) })
} }
// 删除考核审核过程 // 删除考核审核过程
export function delJzxzkhsh(id) { export function delJzxzkhsh(id) {
return request({ return request({
url: '/jxzxkhgl/jxzxkhsh/' + id, url: '/jxzxkhgl/jxzxkhsh/' + id,
method: 'delete' method: 'delete'
}) })
} }
// 导出考核审核过程 // 导出考核审核过程
export function exportJzxzkhsh(query) { export function exportJzxzkhsh(query) {
return request({ return request({
url: '/jxzxkhgl/jxzxkhsh/export', url: '/jxzxkhgl/jxzxkhsh/export',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 提交考核审核过程
export function checkJzxzkhsh(id) {
return request({
url: '/jxzxkhgl/jxzxkhsh/check/' + id,
method: 'post'
})
}

View File

@ -32,6 +32,7 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['jxzxkhgl:jxzxkhgcsj:edit']" v-hasPermi="['jxzxkhgl:jxzxkhgcsj:edit']"
v-show="disable"
>填报</el-button> >填报</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -42,6 +43,7 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['jxzxkhgl:jxzxkhgcsj:remove']" v-hasPermi="['jxzxkhgl:jxzxkhgcsj:remove']"
v-show="disable"
>清空</el-button> >清空</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
@ -49,8 +51,9 @@
type="warning" type="warning"
icon="el-icon-check" icon="el-icon-check"
size="mini" size="mini"
@click="handleDelete" @click="handleCheck"
v-hasPermi="['jxzxkhgl:jxzxkhgcsj:edit']" v-hasPermi="['jxzxkhgl:jxzxkhgcsj:edit']"
v-show="disable"
>提交</el-button> >提交</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@ -72,6 +75,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhgcsj:edit']" v-hasPermi="['jxzxkhgl:jxzxkhgcsj:edit']"
v-show="disable"
>填报</el-button> >填报</el-button>
<el-button <el-button
size="mini" size="mini"
@ -79,6 +83,7 @@
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['jxzxkhgl:jxzxkhgcsj:remove']" v-hasPermi="['jxzxkhgl:jxzxkhgcsj:remove']"
v-show="disable"
>清空</el-button> >清空</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -148,12 +153,21 @@ import {
} from "@/api/jxzxkhgl/jxzxkhgcsj"; } from "@/api/jxzxkhgl/jxzxkhgcsj";
import { listJxzxkhfa, getJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa"; import { listJxzxkhfa, getJxzxkhfa } from "@/api/jxzxkhgl/jxzxkhfa";
import {
listJzxzkhshByfaid,
getJzxzkhsh,
checkJzxzkhsh,
} from "@/api/jxzxkhgl/jxzxkhsh";
import { getToken } from "@/utils/auth"; import { getToken } from "@/utils/auth";
export default { export default {
name: "Jxzxkhgcsj", name: "Jxzxkhgcsj",
data() { data() {
return { return {
//
disable: true,
//id
defaultFaid: "",
filecount: 1, filecount: 1,
khnr: "", khnr: "",
// //
@ -195,6 +209,10 @@ export default {
queryParams_fa: { queryParams_fa: {
status: "1", status: "1",
}, },
//
queryParams_khsh: {
faid: "1",
},
// //
form: {}, form: {},
// //
@ -258,10 +276,21 @@ export default {
}); });
return actions.join(""); return actions.join("");
}, },
//
getIsCheck() {
this.queryParams_khsh.faid = this.defaultFaid;
listJzxzkhshByfaid(this.queryParams_khsh).then((response) => {
if (response.rows.length > 0) {
this.disable = false;
}
});
},
// //
getKhfa() { getKhfa() {
listJxzxkhfa(this.queryParams_fa).then((response) => { listJxzxkhfa(this.queryParams_fa).then((response) => {
this.jxzxkhfaOptions = response.rows; this.jxzxkhfaOptions = response.rows;
this.defaultFaid = response.rows[0].id;
this.queryParams.faid = this.defaultFaid;
}); });
}, },
/** 查询考核过程数据列表 */ /** 查询考核过程数据列表 */
@ -272,6 +301,8 @@ export default {
this.jxzxkhgcsjList = response.rows; this.jxzxkhgcsjList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
this.getIsCheck();
}); });
}, },
// //
@ -303,6 +334,7 @@ export default {
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.queryParams.faid = this.defaultFaid;
this.handleQuery(); this.handleQuery();
}, },
// //
@ -395,6 +427,31 @@ export default {
}) })
.catch(function () {}); .catch(function () {});
}, },
/** 删除按钮操作 */
handleCheck() {
const faid = this.queryParams.faid;
if (faid == null || faid == "") {
this.msgError("请选择要提交的方案");
return;
}
this.$confirm(
"是否确认提交当前方案的考核过程数据项?提交后数据不能维护!",
"警告",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
}
)
.then(function () {
return checkJzxzkhsh(faid);
})
.then(() => {
this.getList();
this.msgSuccess("提交成功");
})
.catch(function () {});
},
}, },
}; };
</script> </script>