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 eecbb8c8b..01025beef 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 @@ -100,6 +100,7 @@ public class TsbzJdcxController extends BaseController { @Log(title = "基地区级审核", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TsbzJdcx tsbzJdcx) { + tsbzJdcx.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); return toAjax(tsbzJdcxService.updateTsbzJdcx(tsbzJdcx)); } diff --git a/ruoyi-ui/src/api/jxjs/jdcx.js b/ruoyi-ui/src/api/jxjs/jdcx.js index 2e1913d40..cf45bd472 100644 --- a/ruoyi-ui/src/api/jxjs/jdcx.js +++ b/ruoyi-ui/src/api/jxjs/jdcx.js @@ -2,60 +2,60 @@ import request from '@/utils/request' // 查询基地区级审核列表 export function listJdcx(query) { - return request({ - url: '/jxjs/jdcx/list', - method: 'get', - params: query - }) + return request({ + url: '/jxjs/jdcx/list', + method: 'get', + params: query + }) } // 查询基地区级审核详细 export function getJdcx(id) { - return request({ - url: '/jxjs/jdcx/' + id, - method: 'get' - }) + return request({ + url: '/jxjs/jdcx/' + id, + method: 'get' + }) } // 新增基地区级审核 export function addJdcx(data) { - return request({ - url: '/jxjs/jdcx', - method: 'post', - data: data - }) + return request({ + url: '/jxjs/jdcx', + method: 'post', + data: data + }) } // 修改基地区级审核 export function updateJdcx(data) { - return request({ - url: '/jxjs/jdcx', - method: 'put', - data: data - }) + return request({ + url: '/jxjs/jdcx', + method: 'put', + data: data + }) } // 删除基地区级审核 export function delJdcx(id) { - return request({ - url: '/jxjs/jdcx/' + id, - method: 'delete' - }) + return request({ + url: '/jxjs/jdcx/' + id, + method: 'delete' + }) } // 导出基地区级审核 export function exportJdcx(query) { - return request({ - url: '/jxjs/jdcx/export', - method: 'get', - params: query - }) + return request({ + url: '/jxjs/jdcx/export', + method: 'get', + params: query + }) } // 删除基地区级审核 export function checkJdcx(id) { - return request({ - url: '/jxjs/jdcx/check/' + id, - method: 'post' - }) + return request({ + url: '/jxjs/jdcx/check/' + id, + method: 'post' + }) } \ No newline at end of file diff --git a/ruoyi-ui/src/views/jxjs/jdcx/index.vue b/ruoyi-ui/src/views/jxjs/jdcx/index.vue index 0adf98b09..6e6abc53a 100644 --- a/ruoyi-ui/src/views/jxjs/jdcx/index.vue +++ b/ruoyi-ui/src/views/jxjs/jdcx/index.vue @@ -7,11 +7,11 @@ v-show="showSearch" label-width="68px" > - + @@ -58,16 +58,16 @@ - - - + + - + - + + - + -->
确 定 @@ -248,6 +246,7 @@ import { } from "@/api/jxjs/jdcx"; import { listJxzxpxfa } from "@/api/jxjs/jxzxpxfa"; +import { listJxjsjbxx, getJxjsjbxx } from "@/api/jxjs/jxjsjbxx"; export default { name: "Jdcx", @@ -273,12 +272,14 @@ export default { open: false, // 当前状态字典 dqztOptions: [], - // 基地校审核状态字典 + // 基地校审核意见字典 jdxshztOptions: [], // 区级审核状态字典 qjshztOptions: [], // 区级审核意见字典 qjshyjOptions: [], + // 教师列表 + jsOptions: [], //方案 faOptions: [], // 查询参数 @@ -349,18 +350,19 @@ export default { created() { this.getFaList(); this.getList(); + this.getJsList(); this.getDicts("sys_dm_shzt").then((response) => { this.dqztOptions = response.data; }); - this.getDicts("sys_dm_shzt").then((response) => { + this.getDicts("sys_dm_shyj").then((response) => { this.jdxshztOptions = response.data; }); - this.getDicts("sys_dm_shzt").then((response) => { + this.getDicts("sys_dm_shyj").then((response) => { this.qjshztOptions = response.data; }); - this.getDicts("sys_dm_shyj").then((response) => { - this.qjshyjOptions = response.data; - }); + // this.getDicts("sys_dm_shyj").then((response) => { + // this.qjshyjOptions = response.data; + // }); }, methods: { // 字典翻译 @@ -388,10 +390,47 @@ export default { this.loading = true; listJdcx(this.queryParams).then((response) => { this.jdcxList = response.rows; + // 过滤未审核和未同意的人员 + this.jdcxList = this.jdcxList.filter(function(item) { + return item.dqzt == 2 && item.jdxshzt == 1; + }); this.total = response.total; this.loading = false; }); }, + // 获取教师信息 + getJsList() { + listJxjsjbxx(null).then((response) => { + this.jsOptions = response.rows; + //console.log(this.jsOptions); + }); + }, + // 基地校名称字典翻译 + jdxmcFormat(row, column) { + // return this.selectDictLabel(this.classOptions, row.classid); + var actions = []; + var datas = this.jsOptions; + Object.keys(datas).map((key) => { + if (datas[key].id == "" + row.jsid) { + actions.push(datas[key].jdxid); + return false; + } + }); + return actions.join(""); + }, + // 字典翻译 + jsFormat(row, column) { + // return this.selectDictLabel(this.classOptions, row.classid); + var actions = []; + var datas = this.jsOptions; + Object.keys(datas).map((key) => { + if (datas[key].id == "" + row.jsid) { + actions.push(datas[key].name); + return false; + } + }); + return actions.join(""); + }, // 当前状态字典翻译 dqztFormat(row, column) { return this.selectDictLabel(this.dqztOptions, row.dqzt); @@ -470,6 +509,7 @@ export default { const id = row.id || this.ids; getJdcx(id).then((response) => { this.form = response.data; + console.log(this.form); this.open = true; this.title = "修改基地区级审核"; }); diff --git a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue index 1f2b3fdbc..aaccdab6c 100644 --- a/ruoyi-ui/src/views/jxjs/jdxcx/index.vue +++ b/ruoyi-ui/src/views/jxjs/jdxcx/index.vue @@ -381,6 +381,7 @@ export default { this.title = "基地校初选"; listJxjsjbxx(null).then((response) => { this.jss = response.rows; + console.log(this.jss + '-------------'); }); }, /** 修改按钮操作 */ @@ -392,6 +393,7 @@ export default { this.form = response.data; listJxjsjbxx(null).then((response) => { this.jss = response.rows; + }); this.checkedJss.push(response.data.jsid); this.open = true; diff --git a/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue b/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue index e230c4566..a60e53243 100644 --- a/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue +++ b/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue @@ -127,7 +127,7 @@ 复制