From 2e8f2ae9fa6a504ddf577139692c7a1398008280 Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Thu, 20 Aug 2020 17:29:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=81=E4=B9=A0=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E8=AF=84=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/jxjs/domain/TsbzJxzxpxfa.java   | 15 ++++++++++++
 .../mapper/jxjs/TsbzJxzxpxfaMapper.xml        |  7 +++++-
 ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue    | 23 +++++++++++++++----
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxpxfa.java b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxpxfa.java
index 2dc1d8b26..6f779ab67 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxpxfa.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxpxfa.java
@@ -28,6 +28,12 @@ public class TsbzJxzxpxfa extends BaseEntity {
     @Excel(name = "方案名称")
     private String name;
 
+    /**
+     * 方案内容
+     */
+    @Excel(name = "方案名称")
+    private String fanr;
+
     /**
      * 方案文件
      */
@@ -177,6 +183,7 @@ public class TsbzJxzxpxfa extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("name", getName())
+                .append("fanr", getFanr())
                 .append("fawj", getFawj())
                 .append("fazt", getFazt())
                 .append("fayxkssj", getFayxkssj())
@@ -189,4 +196,12 @@ public class TsbzJxzxpxfa extends BaseEntity {
                 .append("wjmc", getWjmc())
                 .toString();
     }
+
+    public String getFanr() {
+        return fanr;
+    }
+
+    public void setFanr(String fanr) {
+        this.fanr = fanr;
+    }
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxpxfaMapper.xml b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxpxfaMapper.xml
index 16a9e3203..c979b5ce9 100644
--- a/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxpxfaMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxpxfaMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="TsbzJxzxpxfa" id="TsbzJxzxpxfaResult">
         <result property="id" column="id"/>
         <result property="name" column="name"/>
+        <result property="fanr"    column="fanr" />
         <result property="fawj" column="fawj"/>
         <result property="fazt" column="fazt"/>
         <result property="fayxkssj" column="fayxkssj"/>
@@ -20,13 +21,14 @@
     </resultMap>
 
     <sql id="selectTsbzJxzxpxfaVo">
-        select id, name, fawj, fazt, fayxkssj, fayxjssj, nf, pxxd, pxxk, createuserid, create_time, wjmc from tsbz_jxzxpxfa
+        select id, name, fanr, fawj, fazt, fayxkssj, fayxjssj, nf, pxxd, pxxk, createuserid, create_time, wjmc from tsbz_jxzxpxfa
     </sql>
 
     <select id="selectTsbzJxzxpxfaList" parameterType="TsbzJxzxpxfa" resultMap="TsbzJxzxpxfaResult">
         <include refid="selectTsbzJxzxpxfaVo"/>
         <where>
             <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="fanr != null  and fanr != ''"> and fanr = #{fanr}</if>
             <if test="fawj != null  and fawj != ''">and fawj = #{fawj}</if>
             <if test="fazt != null  and fazt != ''">and fazt = #{fazt}</if>
             <if test="fayxkssj != null ">and fayxkssj = #{fayxkssj}</if>
@@ -48,6 +50,7 @@
         insert into tsbz_jxzxpxfa
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
+            <if test="fanr != null">fanr,</if>
             <if test="fawj != null">fawj,</if>
             <if test="fazt != null">fazt,</if>
             <if test="fayxkssj != null">fayxkssj,</if>
@@ -61,6 +64,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
+            <if test="fanr != null">#{fanr},</if>
             <if test="fawj != null">#{fawj},</if>
             <if test="fazt != null">#{fazt},</if>
             <if test="fayxkssj != null">#{fayxkssj},</if>
@@ -78,6 +82,7 @@
         update tsbz_jxzxpxfa
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
+            <if test="fanr != null">fanr = #{fanr},</if>
             <if test="fawj != null">fawj = #{fawj},</if>
             <if test="fazt != null">fazt = #{fazt},</if>
             <if test="fayxkssj != null">fayxkssj = #{fayxkssj},</if>
diff --git a/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue b/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue
index d6aee86cd..9a6dda007 100644
--- a/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue
+++ b/ruoyi-ui/src/views/jxjs/jxzxpxfa/index.vue
@@ -120,8 +120,8 @@
         </template>
       </el-table-column>
       <el-table-column label="所属年份" align="center" prop="nf" />
-      <el-table-column label="评选学段" align="center" prop="pxxd" />
-      <el-table-column label="评选学科" align="center" prop="pxxk" />
+      <el-table-column label="评选学段" align="center" prop="pxxd" :formatter="pxxdFormat" />
+      <el-table-column label="评选学科" align="center" prop="pxxk" :formatter="pxxkFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -151,12 +151,15 @@
     />
 
     <!-- 添加或修改见习之星评选方案对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1024px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="方案名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入方案名称" />
         </el-form-item>
-        <el-form-item label="方案文件" prop="fawj">
+        <el-form-item label="方案内容" prop="fanr">
+          <Editor v-model="form.fanr" placeholder="请输入方案内容" />
+        </el-form-item>
+        <el-form-item label="方案文件" prop="fawj" >
           <el-input v-model="form.fawj" v-if="false" />
           <el-upload
             class="upload-demo"
@@ -241,9 +244,13 @@ import {
 } from "@/api/jxjs/jxzxpxfa";
 
 import { getToken } from "@/utils/auth";
+import Editor from "@/components/Editor";
 
 export default {
   name: "Jxzxpxfa",
+  components: {
+    Editor
+  },
   data() {
     return {
       // 遮罩层
@@ -358,6 +365,14 @@ export default {
     beforeRemove(file, fileList) {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
+    // 评选学段字典翻译
+    pxxdFormat(row, column) {
+      return this.selectDictLabel(this.pxxdOptions, row.pxxd);
+    },
+    // 评选学科字典翻译
+    pxxkFormat(row, column) {
+      return this.selectDictLabel(this.pxxkOptions, row.pxxk);
+    },
     /** 查询见习之星评选方案列表 */
     getList() {
       this.loading = true;