From 9def2f55086383d80900ce289a72da096e9872f6 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Thu, 2 Sep 2021 11:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E6=95=B0=E5=AD=A6=E5=A4=87?=
=?UTF-8?q?=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/router/index.js | 4 +-
.../views/benyi/assessmentintroduce/index.vue | 2 +-
ruoyi-ui/src/views/benyi/calendar/index.vue | 2 +-
ruoyi-ui/src/views/benyi/customer/index.vue | 2 +-
.../benyi/dayflowassessmentplan/index.vue | 2 +-
ruoyi-ui/src/views/benyi/experience/index.vue | 2 +-
.../benyi/learndevelopmentfamily/index.vue | 2 +-
.../benyi/learndevelopmentteacher/index.vue | 2 +-
ruoyi-ui/src/views/benyi/math/plan.vue | 2 +-
.../src/views/benyi/mathtermplan/data.vue | 62 +++++++------------
.../src/views/benyi/mathtermplan/table.vue | 34 ++++++----
ruoyi-ui/src/views/benyi/planweek/index.vue | 34 +++++-----
.../src/views/benyi/schoolcalendar/index.vue | 2 +-
.../views/benyi/schoolcalendarclass/index.vue | 2 +-
.../src/views/benyi/themeweekplan/data.vue | 2 +-
15 files changed, 75 insertions(+), 81 deletions(-)
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index d9f2333d9..a95e36e1e 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -321,7 +321,7 @@ export const constantRoutes = [
{
path: "data/:id",
component: () => import("@/views/benyi/mathtermplan/data"),
- name: "Mathtermplan1",
+ name: "Mathtermplanitem",
meta: {
title: "游戏数学学期计划(明细)",
icon: ""
@@ -337,7 +337,7 @@ export const constantRoutes = [
{
path: "table/:id",
component: () => import("@/views/benyi/mathtermplan/table"),
- name: "Mathtermplan2",
+ name: "MathTermTable",
meta: {
title: "游戏数学学期计划(表格)",
icon: ""
diff --git a/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue b/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
index 3be07d9b0..e4033147b 100644
--- a/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
@@ -273,7 +273,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除评估体系介绍编号为"' + ids + '"的数据项?',
+ '是否确认删除评估体系介绍数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/calendar/index.vue b/ruoyi-ui/src/views/benyi/calendar/index.vue
index e8bfd482d..2cfbd4396 100644
--- a/ruoyi-ui/src/views/benyi/calendar/index.vue
+++ b/ruoyi-ui/src/views/benyi/calendar/index.vue
@@ -368,7 +368,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除园历管理(本一)编号为"' + ids + '"的数据项?',
+ '是否确认删除园历管理(本一)数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/customer/index.vue b/ruoyi-ui/src/views/benyi/customer/index.vue
index 53da2dc6f..616fd3583 100644
--- a/ruoyi-ui/src/views/benyi/customer/index.vue
+++ b/ruoyi-ui/src/views/benyi/customer/index.vue
@@ -982,7 +982,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除本一-客户关系管理编号为"' + ids + '"的数据项?',
+ '是否确认删除本一-客户关系管理数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
index 52cda6787..83778ab25 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
@@ -467,7 +467,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除幼儿园一日流程评估计划编号为"' + ids + '"的数据项?',
+ '是否确认删除幼儿园一日流程评估计划数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/experience/index.vue b/ruoyi-ui/src/views/benyi/experience/index.vue
index 1927cf05d..1e60957d0 100644
--- a/ruoyi-ui/src/views/benyi/experience/index.vue
+++ b/ruoyi-ui/src/views/benyi/experience/index.vue
@@ -628,7 +628,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除入班体验申请编号为"' + ids + '"的数据项?',
+ '是否确认删除入班体验申请数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/learndevelopmentfamily/index.vue b/ruoyi-ui/src/views/benyi/learndevelopmentfamily/index.vue
index b38b97d30..695b55ff7 100644
--- a/ruoyi-ui/src/views/benyi/learndevelopmentfamily/index.vue
+++ b/ruoyi-ui/src/views/benyi/learndevelopmentfamily/index.vue
@@ -443,7 +443,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除儿童学习与发展档案（家长）编号为"' + ids + '"的数据项?',
+ '是否确认删除儿童学习与发展档案（家长）数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/learndevelopmentteacher/index.vue b/ruoyi-ui/src/views/benyi/learndevelopmentteacher/index.vue
index 76538c35b..1c9b91d14 100644
--- a/ruoyi-ui/src/views/benyi/learndevelopmentteacher/index.vue
+++ b/ruoyi-ui/src/views/benyi/learndevelopmentteacher/index.vue
@@ -443,7 +443,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除儿童学习与发展档案（教师）编号为"' + ids + '"的数据项?',
+ '是否确认删除儿童学习与发展档案（教师）数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/math/plan.vue b/ruoyi-ui/src/views/benyi/math/plan.vue
index ca0c6dd7d..67b7a0bf4 100644
--- a/ruoyi-ui/src/views/benyi/math/plan.vue
+++ b/ruoyi-ui/src/views/benyi/math/plan.vue
@@ -450,7 +450,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除游戏数学方案编号为"' + ids + '"的数据项?',
+ '是否确认删除游戏数学方案数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/mathtermplan/data.vue b/ruoyi-ui/src/views/benyi/mathtermplan/data.vue
index 47b8bed08..62a64b55a 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplan/data.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplan/data.vue
@@ -64,16 +64,6 @@
v-show="isShow"
>填充</el-button
>
- <el-button
- type="danger"
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['benyi:mathtermplan:remove']"
- v-show="isShow"
- >删除</el-button
- >
</div>
<el-table
@@ -115,15 +105,6 @@
v-show="isShow"
>填充</el-button
>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['benyi:mathtermplan:remove']"
- v-show="isShow"
- >删除</el-button
- >
</template>
</el-table-column>
</el-table>
@@ -156,6 +137,7 @@
value-format="yyyy-MM"
placeholder="选择月份"
class="my-date-picker"
+ :disabled="true"
>
</el-date-picker>
</el-form-item>
@@ -464,27 +446,27 @@ export default {
}
});
},
- /** 删除按钮操作 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$confirm(
- '是否确认删除游戏数学学期计划明细编号为"' + ids + '"的数据项?',
- "警告",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
- .then(function () {
- return delMathtermplanitem(ids);
- })
- .then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- })
- .catch(function () {});
- },
+ // /** 删除按钮操作 */
+ // handleDelete(row) {
+ // const ids = row.id || this.ids;
+ // this.$confirm(
+ // '是否确认删除游戏数学学期计划明细编号为"' + ids + '"的数据项?',
+ // "警告",
+ // {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // }
+ // )
+ // .then(function () {
+ // return delMathtermplanitem(ids);
+ // })
+ // .then(() => {
+ // this.getList();
+ // this.msgSuccess("删除成功");
+ // })
+ // .catch(function () {});
+ // },
},
};
</script>
diff --git a/ruoyi-ui/src/views/benyi/mathtermplan/table.vue b/ruoyi-ui/src/views/benyi/mathtermplan/table.vue
index de81abcd1..082668a0a 100644
--- a/ruoyi-ui/src/views/benyi/mathtermplan/table.vue
+++ b/ruoyi-ui/src/views/benyi/mathtermplan/table.vue
@@ -1,9 +1,15 @@
<template>
<div class="table-container" ref="printMe">
- <h2 class="title">{{title}}</h2>
+ <h2 class="title">{{ title }}</h2>
<div class="table">
<div class="print no-print">
- <el-button type="primary" plain size="mini" icon="el-icon-printer" @click="prints"></el-button>
+ <el-button
+ type="primary"
+ plain
+ size="mini"
+ icon="el-icon-printer"
+ @click="prints"
+ ></el-button>
</div>
<table>
<tr class="align-center">
@@ -13,32 +19,36 @@
</td>-->
<td class="w140">
<b class="table-title">班级：</b>
- {{classname}}
+ {{ classname }}
</td>
<td>
<b class="table-title">学期：</b>
- {{xnxqFormat(xnxq)}}
+ {{ xnxqFormat(xnxq) }}
</td>
<td class="w200">
<b class="table-title">制定人：</b>
- {{tbr}}
+ {{ tbr }}
</td>
</tr>
<tr class="align-center table-bg">
<td v-for="h in bodyData.title" :key="h.prop">
- <b>{{h.label}}</b>
+ <b>{{ h.label }}</b>
</td>
</tr>
<tr v-for="item in bodyData.termplanitemList" :key="item.id">
<td class="align-center">
- <span>{{item.month}}</span>
+ <span>{{ item.month }}</span>
</td>
- <td class="align-center">{{mathFormat(item.mathconent)}}</td>
- <td>{{item.remark}}</td>
+ <td class="align-center">{{ mathFormat(item.mathconent) }}</td>
+ <td>{{ item.remark }}</td>
+ </tr>
+ <tr>
+ <td class="align-center">备注</td>
+ <td colspan="2">{{ remark }}</td>
</tr>
<tr>
<td class="align-center">教学主管审批</td>
- <td colspan="2">{{spyj}}</td>
+ <td colspan="2">{{ spyj }}</td>
</tr>
</table>
<!-- <p
@@ -58,7 +68,7 @@ import {
import { listPlan } from "@/api/benyi/plan";
export default {
- name: "TermTable",
+ name: "MathTermTable",
data() {
return {
// 学年学期
@@ -69,6 +79,7 @@ export default {
xnxq: "",
classname: "",
tbr: "",
+ remark: "",
spyj: "",
bodyData: {
title: [
@@ -137,6 +148,7 @@ export default {
this.classname = response.classname;
this.xnxq = response.data.xnxq;
this.spyj = response.data.spyj;
+ this.remark = response.data.remark;
});
this.listMathTermItemPlan();
},
diff --git a/ruoyi-ui/src/views/benyi/planweek/index.vue b/ruoyi-ui/src/views/benyi/planweek/index.vue
index aed7e16bf..bba94dcdc 100644
--- a/ruoyi-ui/src/views/benyi/planweek/index.vue
+++ b/ruoyi-ui/src/views/benyi/planweek/index.vue
@@ -598,23 +598,23 @@ export default {
this.title = "修改周计划(家长和教育部门)";
});
},
- /** 审核提交按钮操作 */
- handleCheck(row) {
- const ids = row.id || this.ids;
- this.$confirm('确认提交周计划编号为"' + ids + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(function () {
- return checkPlanweek(ids);
- })
- .then(() => {
- this.getList();
- this.msgSuccess("提交成功");
- })
- .catch(function () {});
- },
+ // /** 审核提交按钮操作 */
+ // handleCheck(row) {
+ // const ids = row.id || this.ids;
+ // this.$confirm('确认提交周计划编号为"' + ids + '"的数据项?', "警告", {
+ // confirmButtonText: "确定",
+ // cancelButtonText: "取消",
+ // type: "warning",
+ // })
+ // .then(function () {
+ // return checkPlanweek(ids);
+ // })
+ // .then(() => {
+ // this.getList();
+ // this.msgSuccess("提交成功");
+ // })
+ // .catch(function () {});
+ // },
isShow(row) {
if (row.status == "1" || row.status == "2") {
return false;
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
index 33255df48..e92b31f5e 100644
--- a/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
+++ b/ruoyi-ui/src/views/benyi/schoolcalendar/index.vue
@@ -510,7 +510,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除园历管理编号为"' + ids + '"的数据项?',
+ '是否确认删除园历管理数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
index 9055594da..c8308ceab 100644
--- a/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
+++ b/ruoyi-ui/src/views/benyi/schoolcalendarclass/index.vue
@@ -482,7 +482,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除园历管理(班级)编号为"' + ids + '"的数据项?',
+ '是否确认删除园历管理(班级)数据项?',
"警告",
{
confirmButtonText: "确定",
diff --git a/ruoyi-ui/src/views/benyi/themeweekplan/data.vue b/ruoyi-ui/src/views/benyi/themeweekplan/data.vue
index 310aeb7c2..3b5563b4f 100644
--- a/ruoyi-ui/src/views/benyi/themeweekplan/data.vue
+++ b/ruoyi-ui/src/views/benyi/themeweekplan/data.vue
@@ -568,7 +568,7 @@ export default {
handleDelete(row) {
const ids = row.id || this.ids;
this.$confirm(
- '是否确认删除主题整合周计划明细编号为"' + ids + '"的数据项?',
+ '是否确认删除主题整合周计划明细数据项?',
"警告",
{
confirmButtonText: "确定",