From 8faf7c090a406787f15223815f25ede2444cee4c Mon Sep 17 00:00:00 2001 From: paidaxing444 <12qwaszx> Date: Tue, 25 Aug 2020 09:28:53 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AD=A6=E6=9C=9F=E8=AE=A1=E5=88=92=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/benyi/themetermplan.js | 8 + .../src/views/benyi/themetermplan/data.vue | 252 +++++++++++------- .../src/views/benyi/themetermplan/index.vue | 62 ++++- .../controller/ByThemeTermplanController.java | 13 + .../benyi/ByThemeTermplanitemMapper.xml | 31 +-- 5 files changed, 248 insertions(+), 118 deletions(-) diff --git a/ruoyi-ui/src/api/benyi/themetermplan.js b/ruoyi-ui/src/api/benyi/themetermplan.js index 47f5d0308..f1d8a0eef 100644 --- a/ruoyi-ui/src/api/benyi/themetermplan.js +++ b/ruoyi-ui/src/api/benyi/themetermplan.js @@ -43,6 +43,14 @@ export function delTermplan(id) { }) } +// 提交主题整合学期计划 +export function checkTermplan(id) { + return request({ + url: '/benyi/themetermplan/check/' + id, + method: 'post' + }) +} + // 导出主题整合学期计划 export function exportTermplan(query) { return request({ diff --git a/ruoyi-ui/src/views/benyi/themetermplan/data.vue b/ruoyi-ui/src/views/benyi/themetermplan/data.vue index eb5101593..184a2bff9 100644 --- a/ruoyi-ui/src/views/benyi/themetermplan/data.vue +++ b/ruoyi-ui/src/views/benyi/themetermplan/data.vue @@ -2,51 +2,24 @@
- + + + - - - - - - - - - - + + + 搜索 @@ -62,6 +35,7 @@ size="mini" @click="handleAdd" v-hasPermi="['benyi:themetermplan:add']" + v-show="isShow" >新增 @@ -72,6 +46,7 @@ :disabled="single" @click="handleUpdate" v-hasPermi="['benyi:themetermplan:edit']" + v-show="isShow" >修改 @@ -82,17 +57,9 @@ :disabled="multiple" @click="handleDelete" v-hasPermi="['benyi:themetermplan:remove']" + v-show="isShow" >删除 - - 导出 - - - - + + + + - - - - - @@ -144,27 +107,31 @@ - + + + - - - - - - - + - - + + + {{item.name}} + + + + +
@@ -185,10 +152,19 @@ import { exportTermplanitem, } from "@/api/benyi/themetermplanitem"; +import { listTermplan, getTermplan } from "@/api/benyi/themetermplan"; +import { listTheme } from "@/api/benyi/theme"; + export default { name: "Termplanitem", data() { return { + isShow: true, + //最大选中个数 + max: 2, + //主题 + themeOptions: [], + themeList: [], // 遮罩层 loading: true, // 选中数组 @@ -201,10 +177,13 @@ export default { total: 0, // 主题整合学期计划明细表格数据 termplanitemList: [], + //计划列表 + themePlanOptions: [], // 弹出层标题 title: "", // 是否显示弹出层 open: false, + defaultThemeType: "", // 查询参数 queryParams: { pageNum: 1, @@ -212,19 +191,97 @@ export default { tpid: undefined, themeconent: undefined, createuserid: undefined, - 创建时间: undefined, updateuserid: undefined, }, // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + month: [{ required: true, message: "月份不能为空", trigger: "blur" }], + themeconent: [ + { required: true, message: "主题不能为空", trigger: "blur" }, + ], + }, }; }, created() { - this.getList(); + const themeplanid = this.$route.params && this.$route.params.id; + //console.log(themeplanid); + this.getThemePlan(themeplanid); + this.getThemePlanList(); + this.getThemeList(); }, methods: { + // 主题--字典状态字典翻译 + themeFormat(row, column) { + if (row.themeconent != null) { + var ilength = row.themeconent.split(";").length - 1; + var names = ""; + for (var i = 1; i < ilength; i++) { + names = + names + + this.selectMoeDictLabel( + this.themeOptions, + row.themeconent.split(";")[i] + ) + + " "; + } + //this.selectDictLabel(this.scopeOptions, row.xnxq); + return names; + } + return ""; + }, + //获取选中的checkbox + getThemeconentValue() { + //console.log(this.themeList); + var text = ";"; + this.themeList.forEach(function (value, key, arr) { + //console.log(value); // 结果依次为1，2，3 + text = text + value + ";"; + //console.log(text); + }); + this.form.themeconent = text; + }, + //主题 + getThemeList() { + listTheme(null).then((response) => { + //console.log(response.rows); + this.themeOptions = response.rows; + }); + }, + // 字典翻译 + themePlanFormat(row, column) { + // return this.selectDictLabel(this.classOptions, row.classid); + var actions = []; + var datas = this.themePlanOptions; + Object.keys(datas).map((key) => { + if (datas[key].id == "" + row.tpid) { + actions.push(datas[key].name); + return false; + } + }); + return actions.join(""); + }, + //计划详情 + getThemePlan(themeplanid) { + getTermplan(themeplanid).then((response) => { + this.queryParams.tpid = response.data.id; + this.defaultThemeType = response.data.id; + + if (response.data.status == "0") { + this.isShow = true; + } else { + this.isShow = false; + } + + this.getList(); + }); + }, + getThemePlanList() { + listTermplan().then((response) => { + this.themePlanOptions = response.rows; + }); + }, /** 查询主题整合学期计划明细列表 */ getList() { this.loading = true; @@ -247,11 +304,12 @@ export default { themeconent: undefined, remark: undefined, createuserid: undefined, - 创建时间: undefined, + month: undefined, updateuserid: undefined, updateTime: undefined, }; this.resetForm("form"); + this.themeList = []; }, /** 搜索按钮操作 */ handleQuery() { @@ -261,6 +319,7 @@ export default { /** 重置按钮操作 */ resetQuery() { this.resetForm("queryForm"); + this.queryParams.tpid = this.defaultThemeType; this.handleQuery(); }, // 多选框选中数据 @@ -274,6 +333,7 @@ export default { this.reset(); this.open = true; this.title = "添加主题整合学期计划明细"; + this.form.tpid = this.queryParams.tpid; }, /** 修改按钮操作 */ handleUpdate(row) { @@ -283,6 +343,16 @@ export default { this.form = response.data; this.open = true; this.title = "修改主题整合学期计划明细"; + var themeconent = response.data.themeconent.split(";"); + var array = []; + //console.log(arr); + themeconent.forEach(function (value, key, arr) { + //console.log(value); // 结果依次为1，2，3 + if (value != "") { + array.push(parseInt(value)); + } + }); + this.themeList = array; }); }, /** 提交按钮 */ @@ -330,22 +400,6 @@ export default { }) .catch(function () {}); }, - /** 导出按钮操作 */ - handleExport() { - const queryParams = this.queryParams; - this.$confirm("是否确认导出所有主题整合学期计划明细数据项?", "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning", - }) - .then(function () { - return exportTermplanitem(queryParams); - }) - .then((response) => { - this.download(response.msg); - }) - .catch(function () {}); - }, }, }; \ No newline at end of file diff --git a/ruoyi-ui/src/views/benyi/themetermplan/index.vue b/ruoyi-ui/src/views/benyi/themetermplan/index.vue index ad76c291e..c1640697b 100644 --- a/ruoyi-ui/src/views/benyi/themetermplan/index.vue +++ b/ruoyi-ui/src/views/benyi/themetermplan/index.vue @@ -23,7 +23,12 @@ - + @@ -65,7 +70,7 @@ - +