From c9615036310689c11fa56ecf365f75cf652a0b4e Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Mon, 14 Dec 2020 14:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=9B=AD=E4=BD=93=E9=AA=8C=20?=
 =?UTF-8?q?=E5=85=A5=E5=AD=A6=E9=80=9A=E7=9F=A5=E4=B9=A6=20=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/benyi/assessment/index.vue | 12 +++
 .../src/views/benyi/halfdayplan/index.vue     | 74 ++++++++++++++-----
 .../benyi/recruitstudentsnotice/index.vue     | 52 +++++++++++--
 3 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/assessment/index.vue b/ruoyi-ui/src/views/benyi/assessment/index.vue
index c093360b4..7e4acc2d0 100644
--- a/ruoyi-ui/src/views/benyi/assessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessment/index.vue
@@ -2,6 +2,18 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" label-width="70px">
       <el-row :gutter="10">
+         <el-col :xs="24" :ms="12" :md="5">
+           <el-form-item label="选择班级" prop="classid">
+            <el-select v-model="queryParams.classid" placeholder="请选择班级">
+              <el-option
+                v-for="dict in classOptions"
+                :key="dict.bjbh"
+                :label="dict.bjmc"
+                :value="dict.bjbh"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :xs="24" :ms="12" :md="5">
           <el-form-item label="幼儿姓名" prop="name">
             <el-input
diff --git a/ruoyi-ui/src/views/benyi/halfdayplan/index.vue b/ruoyi-ui/src/views/benyi/halfdayplan/index.vue
index abd974915..a18e8fea2 100644
--- a/ruoyi-ui/src/views/benyi/halfdayplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/halfdayplan/index.vue
@@ -133,6 +133,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 添加或修改入园半日体验计划对话框 -->
+    <el-dialog
+      :title="title_view"
+      :visible.sync="open_view"
+      class="big-dialog"
+      append-to-body
+    >
+      <el-button
+        type="primary"
+        plain
+        size="mini"
+        icon="el-icon-printer"
+        @click="prints"
+        >打印</el-button
+      >
+      <div ref="printMe">
+        <el-form ref="form" :model="form" label-width="80px">
+          <el-form-item prop="title">
+            <h2 style="text-align: center">{{ form.title }}</h2>
+          </el-form-item>
+          <el-form-item prop="content">
+            <!-- <Editor v-model="form.content" placeholder="请输入内容" /> -->
+            <span v-html="form.content"></span>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel_view">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -171,8 +202,10 @@ export default {
       typeOptions: [],
       // 弹出层标题
       title: "",
+      title_view: "",
       // 是否显示弹出层
       open: false,
+      open_view: false,
       isshow: true,
       // 查询参数
       queryParams: {
@@ -225,6 +258,10 @@ export default {
       this.open = false;
       this.reset();
     },
+    cancel_view() {
+      this.open_view = false;
+      this.reset();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -259,8 +296,8 @@ export default {
       const id = row.id || this.ids;
       getHalfdayplan(id).then((response) => {
         this.form = response.data;
-        this.open = true;
-        this.title = "入园半日体验计划详情";
+        this.open_view = true;
+        this.title_view = "入园半日体验计划详情";
         this.isshow = false;
       });
     },
@@ -309,15 +346,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$confirm(
-        '是否确认删除入园半日体验计划编号为"' + ids + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      this.$confirm("是否确认删除入园半日体验计划数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
         .then(function () {
           return delHalfdayplan(ids);
         })
@@ -330,15 +363,11 @@ export default {
     /** 复制按钮操作 */
     handleCopy(row) {
       const id = row.id || this.ids;
-      this.$confirm(
-        '确认复制入园半日体验计划编号为"' + id + '"的数据项?',
-        "警告",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
+      this.$confirm("确认复制入园半日体验计划数据项?", "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
         .then(function () {
           return copyHalfdayplan(id);
         })
@@ -348,6 +377,11 @@ export default {
         })
         .catch(function () {});
     },
+    //打印
+    prints() {
+      //console.log(this.$refs.printMe);
+      this.$print(this.$refs.printMe);
+    },
   },
 };
 </script>
diff --git a/ruoyi-ui/src/views/benyi/recruitstudentsnotice/index.vue b/ruoyi-ui/src/views/benyi/recruitstudentsnotice/index.vue
index 272dfad57..ae06f6bb7 100644
--- a/ruoyi-ui/src/views/benyi/recruitstudentsnotice/index.vue
+++ b/ruoyi-ui/src/views/benyi/recruitstudentsnotice/index.vue
@@ -165,6 +165,37 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 添加或修改入园通知书对话框 -->
+    <el-dialog
+      :title="title_view"
+      :visible.sync="open_view"
+      class="big-dialog"
+      append-to-body
+    >
+      <el-button
+        type="primary"
+        plain
+        size="mini"
+        icon="el-icon-printer"
+        @click="prints"
+        >打印</el-button
+      >
+      <div ref="printMe">
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-form-item prop="title">
+            <h2 style="text-align: center">{{ form.title }}</h2>
+          </el-form-item>
+          <el-form-item prop="content">
+            <!-- <Editor v-model="form.content" placeholder="请输入内容" /> -->
+            <span v-html="form.content"></span>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel_view">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -203,8 +234,10 @@ export default {
       typeOptions: [],
       // 弹出层标题
       title: "",
+      title_view: "",
       // 是否显示弹出层
       open: false,
+      open_view: false,
       isshow: true,
       // 查询参数
       queryParams: {
@@ -254,6 +287,11 @@ export default {
       this.open = false;
       this.reset();
     },
+    // 取消按钮
+    cancel_view() {
+      this.open_view = false;
+      this.reset();
+    },
     // 表单重置
     reset() {
       this.form = {
@@ -288,9 +326,8 @@ export default {
       const id = row.id || this.ids;
       getNotice(id).then((response) => {
         this.form = response.data;
-        this.open = true;
-        this.title = "入园通知书详情";
-        this.isshow = false;
+        this.open_view = true;
+        this.title_view = "入园通知书详情";
       });
     },
     /** 新增按钮操作 */
@@ -339,7 +376,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm(
-        '是否确认删除入园通知书编号为"' + ids + '"的数据项?',
+        '是否确认删除入园通知书数据项?',
         "警告",
         {
           confirmButtonText: "确定",
@@ -359,7 +396,7 @@ export default {
     /** 复制按钮操作 */
     handleCopy(row) {
       const id = row.id || this.ids;
-      this.$confirm('确认复制入园通知书编号为"' + id + '"的数据项?', "警告", {
+      this.$confirm('确认复制入园通知书数据项?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
@@ -373,6 +410,11 @@ export default {
         })
         .catch(function () {});
     },
+    //打印
+    prints() {
+      //console.log(this.$refs.printMe);
+      this.$print(this.$refs.printMe);
+    },
   },
 };
 </script>