diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java index 0623aeb41..eecbb8c8b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJdcxController.java @@ -1,6 +1,9 @@ package com.ruoyi.web.controller.jxjs; import java.util.List; + +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.web.controller.common.SchoolCommonController; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -22,24 +25,24 @@ import com.ruoyi.common.core.page.TableDataInfo; /** * 基地区级审核Controller - * + * * @author ruoyi * @date 2020-08-20 */ @RestController @RequestMapping("/jxjs/jdcx") -public class TsbzJdcxController extends BaseController -{ +public class TsbzJdcxController extends BaseController { @Autowired private ITsbzJdcxService tsbzJdcxService; + @Autowired + private SchoolCommonController schoolCommonController; /** * 查询基地区级审核列表 */ @PreAuthorize("@ss.hasPermi('jxjs:jdcx:list')") @GetMapping("/list") - public TableDataInfo list(TsbzJdcx tsbzJdcx) - { + public TableDataInfo list(TsbzJdcx tsbzJdcx) { startPage(); List list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx); return getDataTable(list); @@ -51,8 +54,7 @@ public class TsbzJdcxController extends BaseController @PreAuthorize("@ss.hasPermi('jxjs:jdcx:export')") @Log(title = "基地区级审核", businessType = BusinessType.EXPORT) @GetMapping("/export") - public AjaxResult export(TsbzJdcx tsbzJdcx) - { + public AjaxResult export(TsbzJdcx tsbzJdcx) { List list = tsbzJdcxService.selectTsbzJdcxList(tsbzJdcx); ExcelUtil util = new ExcelUtil(TsbzJdcx.class); return util.exportExcel(list, "jdcx"); @@ -63,20 +65,32 @@ public class TsbzJdcxController extends BaseController */ @PreAuthorize("@ss.hasPermi('jxjs:jdcx:query')") @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { + public AjaxResult getInfo(@PathVariable("id") Long id) { return AjaxResult.success(tsbzJdcxService.selectTsbzJdcxById(id)); } /** - * 新增基地区级审核 + * 新增基地区级初级审核 */ @PreAuthorize("@ss.hasPermi('jxjs:jdcx:add')") @Log(title = "基地区级审核", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody TsbzJdcx tsbzJdcx) - { - return toAjax(tsbzJdcxService.insertTsbzJdcx(tsbzJdcx)); + public AjaxResult add(@RequestBody TsbzJdcx tsbzJdcx) { + int iCount = 0; + //暂用当前状态 传 过来jsid数组 + String jsIds = tsbzJdcx.getDqzt(); + if (!schoolCommonController.isStringEmpty(jsIds)) { + String[] arrJsId = jsIds.split(","); + for (int i = 0; i < arrJsId.length; i++) { + tsbzJdcx.setJsid(Long.valueOf(arrJsId[i])); + tsbzJdcx.setDqzt("1"); + tsbzJdcx.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); + iCount = iCount + tsbzJdcxService.insertTsbzJdcx(tsbzJdcx); + } + } else { + return AjaxResult.error("请选择教师"); + } + return toAjax(iCount); } /** @@ -85,19 +99,38 @@ public class TsbzJdcxController extends BaseController @PreAuthorize("@ss.hasPermi('jxjs:jdcx:edit')") @Log(title = "基地区级审核", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody TsbzJdcx tsbzJdcx) - { + public AjaxResult edit(@RequestBody TsbzJdcx tsbzJdcx) { return toAjax(tsbzJdcxService.updateTsbzJdcx(tsbzJdcx)); } + /** + * 提交基地校初级审核 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jdcx:edit')") + @Log(title = "提交基地校初级审核", businessType = BusinessType.UPDATE) + @PostMapping("/check/{ids}") + public AjaxResult check(@PathVariable Long[] ids) { + int iCount = 0; + TsbzJdcx tsbzJdcx = null; + for (int i = 0; i < ids.length; i++) { + tsbzJdcx = new TsbzJdcx(); + tsbzJdcx.setId(ids[i]); + tsbzJdcx.setDqzt("2"); + tsbzJdcx.setJdxshzt("1"); + tsbzJdcx.setJdxshr(SecurityUtils.getLoginUser().getUser().getUserId()); + + iCount = iCount + tsbzJdcxService.updateTsbzJdcx(tsbzJdcx); + } + return toAjax(iCount); + } + /** * 删除基地区级审核 */ @PreAuthorize("@ss.hasPermi('jxjs:jdcx:remove')") @Log(title = "基地区级审核", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(tsbzJdcxService.deleteTsbzJdcxByIds(ids)); } } diff --git a/ruoyi-ui/src/api/jxjs/jdcx.js b/ruoyi-ui/src/api/jxjs/jdcx.js index bfcd623d2..2e1913d40 100644 --- a/ruoyi-ui/src/api/jxjs/jdcx.js +++ b/ruoyi-ui/src/api/jxjs/jdcx.js @@ -50,4 +50,12 @@ export function exportJdcx(query) { method: 'get', params: query }) +} + +// 删除基地区级审核 +export function checkJdcx(id) { + return request({ + url: '/jxjs/jdcx/check/' + id, + method: 'post' + }) } \ No newline at end of file diff --git a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue index 2f0372de4..1f2b3fdbc 100644 --- a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue +++ b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue @@ -41,7 +41,7 @@ :disabled="single" @click="handleUpdate" v-hasPermi="['jxjs:jdcx:edit']" - >提交 + >修改 删除 + + 提交 + - - + + - - - - - - - - @@ -119,115 +113,34 @@ /> - + - - - - - - - - + + - - - - - - - - - - + + 全选 +
+ + {{js.name}} + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
确 定 @@ -245,6 +158,7 @@ import { addJdcx, updateJdcx, exportJdcx, + checkJdcx, } from "@/api/jxjs/jdcx"; import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa"; @@ -255,6 +169,12 @@ export default { name: "Jdcx", data() { return { + isable: false, + isCheck: true, + checkAll: false, + checkedJss: [], + jss: [], + isIndeterminate: false, // 遮罩层 loading: true, // 选中数组 @@ -277,8 +197,6 @@ export default { dqztOptions: [], // 基地校审核状态字典 jdxshztOptions: [], - // 区级审核状态字典 - qjshztOptions: [], // 区级审核意见字典 qjshyjOptions: [], //方案 @@ -319,33 +237,12 @@ export default { form: {}, // 表单校验 rules: { - faid: [ - { required: true, message: "方案编号不能为空", trigger: "blur" }, - ], - jsid: [ - { required: true, message: "教师编号不能为空", trigger: "blur" }, - ], + faid: [{ required: true, message: "方案不能为空", trigger: "blur" }], dqzt: [ - { required: true, message: "当前状态不能为空", trigger: "blur" }, + { required: true, message: "请至少选择一个教师", trigger: "blur" }, ], - jdxshzt: [ - { - required: true, - message: "基地校审核状态不能为空", - trigger: "blur", - }, - ], - qjshzt: [ - { required: true, message: "区级审核状态不能为空", trigger: "blur" }, - ], - qjshyj: [ - { required: true, message: "区级审核意见不能为空", trigger: "blur" }, - ], - zhdf: [ - { required: true, message: "综合得分不能为空", trigger: "blur" }, - ], - zhdf2: [ - { required: true, message: "综合得分2不能为空", trigger: "blur" }, + sbly: [ + { required: true, message: "上报理由不能为空", trigger: "blur" }, ], }, }; @@ -357,17 +254,19 @@ export default { this.getDicts("sys_dm_shzt").then((response) => { this.dqztOptions = response.data; }); - this.getDicts("sys_dm_shzt").then((response) => { - this.jdxshztOptions = response.data; - }); - this.getDicts("sys_dm_shzt").then((response) => { - this.qjshztOptions = response.data; - }); this.getDicts("sys_dm_shyj").then((response) => { - this.qjshyjOptions = response.data; + this.jdxshztOptions = response.data; }); }, methods: { + isShow(row) { + console.log(row.dqzt); + if (row.dqzt == "2" || row.dqzt == "9") { + return false; + } else { + return true; + } + }, // 字典翻译 faFormat(row, column) { // return this.selectDictLabel(this.classOptions, row.classid); @@ -422,14 +321,6 @@ export default { jdxshztFormat(row, column) { return this.selectDictLabel(this.jdxshztOptions, row.jdxshzt); }, - // 区级审核状态字典翻译 - qjshztFormat(row, column) { - return this.selectDictLabel(this.qjshztOptions, row.qjshzt); - }, - // 区级审核意见字典翻译 - qjshyjFormat(row, column) { - return this.selectDictLabel(this.qjshyjOptions, row.qjshyj); - }, // 取消按钮 cancel() { this.open = false; @@ -463,6 +354,8 @@ export default { zhdf2: null, }; this.resetForm("form"); + + this.checkedJss = []; }, /** 搜索按钮操作 */ handleQuery() { @@ -483,17 +376,26 @@ export default { /** 新增按钮操作 */ handleAdd() { this.reset(); + this.isable = false; this.open = true; - this.title = "添加基地区级审核"; + this.title = "基地校初选"; + listJxjsjbxx(null).then((response) => { + this.jss = response.rows; + }); }, /** 修改按钮操作 */ handleUpdate(row) { this.reset(); + this.isable = true; const id = row.id || this.ids; getJdcx(id).then((response) => { this.form = response.data; + listJxjsjbxx(null).then((response) => { + this.jss = response.rows; + }); + this.checkedJss.push(response.data.jsid); this.open = true; - this.title = "修改基地区级审核"; + this.title = "修改基地校初选信息"; }); }, /** 提交按钮 */ @@ -524,7 +426,7 @@ export default { handleDelete(row) { const ids = row.id || this.ids; this.$confirm( - '是否确认删除基地区级审核编号为"' + ids + '"的数据项?', + '是否确认删除基地校初级审核编号为"' + ids + '"的数据项?', "警告", { confirmButtonText: "确定", @@ -541,22 +443,61 @@ export default { }) .catch(function () {}); }, - /** 导出按钮操作 */ - handleExport() { - const queryParams = this.queryParams; - this.$confirm("是否确认导出所有基地区级审核数据项?", "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) + /** 提交按钮操作 */ + handleCheck(row) { + const ids = row.id || this.ids; + this.$confirm( + '确认提交基地校初级审核编号为"' + ids + '"的数据项?', + "警告", + { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + } + ) .then(function () { - return exportJdcx(queryParams); + return checkJdcx(ids); }) - .then((response) => { - this.download(response.msg); + .then(() => { + this.getList(); + this.msgSuccess("提交成功"); }) .catch(function () {}); }, + handleCheckAllChange(val) { + // this.checkedJss = val ? this.jss : []; + // this.isIndeterminate = false; + this.checkedJss = []; + this.jss.forEach((item) => { + //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去 + this.checkedJss.push(item.id); + }); + this.checkedJss = val ? this.checkedJss : []; //三元表达式，如果val的值为true，那么就把当前默认选中的值赋值给自身，这样页面页面上所有的元素就都选中了。如果为false，就是取消全选 + this.isIndeterminate = false; //官网说这是个样式控制，是来控制，什么时候半选的，要不要都无所谓，看你需求 + + //console.log(this.checkedJss); + var cids = ""; + this.checkedJss.forEach((item) => { + //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去 + cids = cids + item + ","; + }); + //console.log(cids); + this.form.dqzt = cids; + }, + handlecheckedJssChange(value) { + let checkedCount = value.length; + this.checkAll = checkedCount === this.jss.length; + this.isIndeterminate = checkedCount > 0 && checkedCount < this.jss.length; + + console.log(this.isIndeterminate); + var cids = ""; + this.checkedJss.forEach((item) => { + //当全选被选中的时候，循环遍历源数据，把数据的每一项加入到默认选中的数组去 + cids = cids + item + ","; + }); + //console.log(cids); + this.form.dqzt = cids; + }, }, };