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 6a5ffa84f..2a6a06df0 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,8 +1,12 @@ package com.ruoyi.web.controller.jxjs; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.jxjs.domain.TsbzJxzxmd; +import com.ruoyi.jxjs.service.ITsbzJxzxmdService; import com.ruoyi.web.controller.common.SchoolCommonController; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +40,8 @@ public class TsbzJdcxController extends BaseController { private ITsbzJdcxService tsbzJdcxService; @Autowired private SchoolCommonController schoolCommonController; + @Autowired + private ITsbzJxzxmdService tsbzJxzxmdService; /** * 查询基地区级审核列表 @@ -101,6 +107,27 @@ public class TsbzJdcxController extends BaseController { @Log(title = "基地区级审核", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody TsbzJdcx tsbzJdcx) { + + //区级审核人 + if (tsbzJdcx.getQjshr() != null && tsbzJdcx.getQjshr().equals(2)) { + tsbzJdcx.setQjshr(SecurityUtils.getLoginUser().getUser().getUserId()); + } + + //如果lqzt为1，则代表录取成功，则在见习名单表插入一条记录 + if (!schoolCommonController.isStringEmpty(tsbzJdcx.getLqzt()) && tsbzJdcx.getLqzt().equals("1")) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy"); + Date date = new Date(); + System.out.println("year=" + sdf.format(date)); + + TsbzJxzxmd tsbzJxzxmd = new TsbzJxzxmd(); + + tsbzJxzxmd.setJsid(tsbzJdcx.getJsid()); + tsbzJxzxmd.setNf(sdf.format(date)); + tsbzJxzxmd.setCreateuserid(SecurityUtils.getLoginUser().getUser().getUserId()); + + tsbzJxzxmdService.insertTsbzJxzxmd(tsbzJxzxmd); + } + return toAjax(tsbzJdcxService.updateTsbzJdcx(tsbzJdcx)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxmdController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxmdController.java new file mode 100644 index 000000000..05a4ffade --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/jxjs/TsbzJxzxmdController.java @@ -0,0 +1,97 @@ +package com.ruoyi.web.controller.jxjs; + +import java.util.List; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.jxjs.domain.TsbzJxzxmd; +import com.ruoyi.jxjs.service.ITsbzJxzxmdService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 见习之星名单Controller + * + * @author ruoyi + * @date 2020-08-23 + */ +@RestController +@RequestMapping("/jxjs/jxzxmd") +public class TsbzJxzxmdController extends BaseController { + @Autowired + private ITsbzJxzxmdService tsbzJxzxmdService; + + /** + * 查询见习之星名单列表 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:list')") + @GetMapping("/list") + public TableDataInfo list(TsbzJxzxmd tsbzJxzxmd) { + startPage(); + List list = tsbzJxzxmdService.selectTsbzJxzxmdList(tsbzJxzxmd); + return getDataTable(list); + } + + /** + * 导出见习之星名单列表 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:export')") + @Log(title = "见习之星名单", businessType = BusinessType.EXPORT) + @GetMapping("/export") + public AjaxResult export(TsbzJxzxmd tsbzJxzxmd) { + List list = tsbzJxzxmdService.selectTsbzJxzxmdList(tsbzJxzxmd); + ExcelUtil util = new ExcelUtil(TsbzJxzxmd.class); + return util.exportExcel(list, "jxzxmd"); + } + + /** + * 获取见习之星名单详细信息 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) { + return AjaxResult.success(tsbzJxzxmdService.selectTsbzJxzxmdById(id)); + } + + /** + * 新增见习之星名单 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:add')") + @Log(title = "见习之星名单", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody TsbzJxzxmd tsbzJxzxmd) { + return toAjax(tsbzJxzxmdService.insertTsbzJxzxmd(tsbzJxzxmd)); + } + + /** + * 修改见习之星名单 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:edit')") + @Log(title = "见习之星名单", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody TsbzJxzxmd tsbzJxzxmd) { + return toAjax(tsbzJxzxmdService.updateTsbzJxzxmd(tsbzJxzxmd)); + } + + /** + * 删除见习之星名单 + */ + @PreAuthorize("@ss.hasPermi('jxjs:jxzxmd:remove')") + @Log(title = "见习之星名单", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) { + return toAjax(tsbzJxzxmdService.deleteTsbzJxzxmdByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java new file mode 100644 index 000000000..0e180693d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java @@ -0,0 +1,82 @@ +package com.ruoyi.jxjs.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 见习之星名单对象 tsbz_jxzxmd + * + * @author ruoyi + * @date 2020-08-23 + */ +public class TsbzJxzxmd extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 编号 + */ + private Long id; + + /** + * 教师id + */ + @Excel(name = "教师id") + private Long jsid; + + /** + * 年份 + */ + @Excel(name = "年份") + private String nf; + + /** + * 创建人 + */ + @Excel(name = "创建人") + private Long createuserid; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setJsid(Long jsid) { + this.jsid = jsid; + } + + public Long getJsid() { + return jsid; + } + + public void setNf(String nf) { + this.nf = nf; + } + + public String getNf() { + return nf; + } + + public void setCreateuserid(Long createuserid) { + this.createuserid = createuserid; + } + + public Long getCreateuserid() { + return createuserid; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("jsid", getJsid()) + .append("nf", getNf()) + .append("createuserid", getCreateuserid()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java new file mode 100644 index 000000000..97d5e1afb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.jxjs.mapper; + +import java.util.List; + +import com.ruoyi.jxjs.domain.TsbzJxzxmd; + +/** + * 见习之星名单Mapper接口 + * + * @author ruoyi + * @date 2020-08-23 + */ +public interface TsbzJxzxmdMapper { + /** + * 查询见习之星名单 + * + * @param id 见习之星名单ID + * @return 见习之星名单 + */ + public TsbzJxzxmd selectTsbzJxzxmdById(Long id); + + /** + * 查询见习之星名单列表 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 见习之星名单集合 + */ + public List selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd); + + /** + * 新增见习之星名单 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 结果 + */ + public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd); + + /** + * 修改见习之星名单 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 结果 + */ + public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd); + + /** + * 删除见习之星名单 + * + * @param id 见习之星名单ID + * @return 结果 + */ + public int deleteTsbzJxzxmdById(Long id); + + /** + * 批量删除见习之星名单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteTsbzJxzxmdByIds(Long[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java new file mode 100644 index 000000000..fa5782e8a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java @@ -0,0 +1,61 @@ +package com.ruoyi.jxjs.service; + +import java.util.List; +import com.ruoyi.jxjs.domain.TsbzJxzxmd; + +/** + * 见习之星名单Service接口 + * + * @author ruoyi + * @date 2020-08-23 + */ +public interface ITsbzJxzxmdService +{ + /** + * 查询见习之星名单 + * + * @param id 见习之星名单ID + * @return 见习之星名单 + */ + public TsbzJxzxmd selectTsbzJxzxmdById(Long id); + + /** + * 查询见习之星名单列表 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 见习之星名单集合 + */ + public List selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd); + + /** + * 新增见习之星名单 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 结果 + */ + public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd); + + /** + * 修改见习之星名单 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 结果 + */ + public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd); + + /** + * 批量删除见习之星名单 + * + * @param ids 需要删除的见习之星名单ID + * @return 结果 + */ + public int deleteTsbzJxzxmdByIds(Long[] ids); + + /** + * 删除见习之星名单信息 + * + * @param id 见习之星名单ID + * @return 结果 + */ + public int deleteTsbzJxzxmdById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java new file mode 100644 index 000000000..4b9ea498e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java @@ -0,0 +1,95 @@ +package com.ruoyi.jxjs.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.jxjs.mapper.TsbzJxzxmdMapper; +import com.ruoyi.jxjs.domain.TsbzJxzxmd; +import com.ruoyi.jxjs.service.ITsbzJxzxmdService; + +/** + * 见习之星名单Service业务层处理 + * + * @author ruoyi + * @date 2020-08-23 + */ +@Service +public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService +{ + @Autowired + private TsbzJxzxmdMapper tsbzJxzxmdMapper; + + /** + * 查询见习之星名单 + * + * @param id 见习之星名单ID + * @return 见习之星名单 + */ + @Override + public TsbzJxzxmd selectTsbzJxzxmdById(Long id) + { + return tsbzJxzxmdMapper.selectTsbzJxzxmdById(id); + } + + /** + * 查询见习之星名单列表 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 见习之星名单 + */ + @Override + public List selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd) + { + return tsbzJxzxmdMapper.selectTsbzJxzxmdList(tsbzJxzxmd); + } + + /** + * 新增见习之星名单 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 结果 + */ + @Override + public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) + { + tsbzJxzxmd.setCreateTime(DateUtils.getNowDate()); + return tsbzJxzxmdMapper.insertTsbzJxzxmd(tsbzJxzxmd); + } + + /** + * 修改见习之星名单 + * + * @param tsbzJxzxmd 见习之星名单 + * @return 结果 + */ + @Override + public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd) + { + return tsbzJxzxmdMapper.updateTsbzJxzxmd(tsbzJxzxmd); + } + + /** + * 批量删除见习之星名单 + * + * @param ids 需要删除的见习之星名单ID + * @return 结果 + */ + @Override + public int deleteTsbzJxzxmdByIds(Long[] ids) + { + return tsbzJxzxmdMapper.deleteTsbzJxzxmdByIds(ids); + } + + /** + * 删除见习之星名单信息 + * + * @param id 见习之星名单ID + * @return 结果 + */ + @Override + public int deleteTsbzJxzxmdById(Long id) + { + return tsbzJxzxmdMapper.deleteTsbzJxzxmdById(id); + } +} diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml index 80eb50cf6..661462969 100644 --- a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml @@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, faid, jsid, dqzt, createuserid, create_time, jdxshr, jdxshzt, sbly, qjshr, qjshzt, qjshyj, jdpx, alfxdf, jasjdf, gbzdf, zhdf, cjdrcreate_time, msqr, msqrcreate_time, msjgmnktjxdf, yjdf, zhdf2 from tsbz_jdcx + select id, faid, jsid, dqzt, createuserid, create_time, jdxshr, jdxshzt, sbly, qjshr, qjshzt, qjshyj, jdpx, alfxdf, jasjdf, gbzdf, zhdf, cjdrcreate_time, msqr, msqrcreate_time, msjgmnktjxdf, yjdf, zhdf2, lqzt from tsbz_jdcx @@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" msjgmnktjxdf, yjdf, zhdf2, + lqzt, #{faid}, @@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{msjgmnktjxdf}, #{yjdf}, #{zhdf2}, + #{lqzt}, @@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" msjgmnktjxdf = #{msjgmnktjxdf}, yjdf = #{yjdf}, zhdf2 = #{zhdf2}, + lqzt = #{lqzt}, where id = #{id} diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml new file mode 100644 index 000000000..45213f46f --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + select id, jsid, nf, createuserid, create_time from tsbz_jxzxmd + + + + + + + + insert into tsbz_jxzxmd + + jsid, + nf, + createuserid, + create_time, + + + #{jsid}, + #{nf}, + #{createuserid}, + #{createTime}, + + + + + update tsbz_jxzxmd + + jsid = #{jsid}, + nf = #{nf}, + createuserid = #{createuserid}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from tsbz_jxzxmd where id = #{id} + + + + delete from tsbz_jxzxmd where id in + + #{id} + + + + \ No newline at end of file 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..d693d2372 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 +248,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 +274,14 @@ export default { open: false, // 当前状态字典 dqztOptions: [], - // 基地校审核状态字典 + // 基地校审核意见字典 jdxshztOptions: [], // 区级审核状态字典 qjshztOptions: [], // 区级审核意见字典 qjshyjOptions: [], + // 教师列表 + jsOptions: [], //方案 faOptions: [], // 查询参数 @@ -349,18 +352,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 +392,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 +511,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 @@ 复制 diff --git a/ruoyi-ui/src/views/jxjs/msqr/index.vue b/ruoyi-ui/src/views/jxjs/msqr/index.vue index 9b1efb1a2..5ee995614 100644 --- a/ruoyi-ui/src/views/jxjs/msqr/index.vue +++ b/ruoyi-ui/src/views/jxjs/msqr/index.vue @@ -13,13 +13,19 @@ - + + + + + + + + 搜索 @@ -38,16 +44,6 @@ v-hasPermi="['jxjs:jdcx:edit']" >确认 - - 删除 - - - - - + + + + - - - - - - - - - - - - - - - - --> + + + + + @@ -134,113 +108,16 @@ - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
确 定 @@ -251,17 +128,12 @@