FinalYu 2 mesiacov pred
rodič
commit
daa09bde8d

+ 11 - 0
nasc-system/src/main/java/com/nasc/custom/domain/NascMatter.java

@@ -33,6 +33,9 @@ public class NascMatter extends BaseEntity {
     /** 联系人电话 */
     private String contactsPhone;
 
+    /** 常见问题 */
+    private String commonProblem;
+
     /** 排序号,数字越大排序越靠前 */
     private Long sortNum;
 
@@ -110,6 +113,14 @@ public class NascMatter extends BaseEntity {
         this.contactsPhone = contactsPhone;
     }
 
+    public String getCommonProblem() {
+        return commonProblem;
+    }
+
+    public void setCommonProblem(String commonProblem) {
+        this.commonProblem = commonProblem;
+    }
+
     public Long getDelFlag() {
         return delFlag;
     }

+ 6 - 5
nasc-system/src/main/resources/mapper/custom/NascMatterMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result      property="sortNum"         column="sort_num"                />
         <result      property="contacts"        column="contacts"                />
         <result      property="contactsPhone"   column="contacts_phone"          />
+        <result      property="commonProblem"   column="common_problem"          />
         <result      property="delFlag"         column="del_flag"                />
         <result      property="createBy"        column="create_by"               />
         <result      property="createTime"      column="create_time"             />
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectMatterList" parameterType="NascMatter" resultMap="matterResult">
 		SELECT nm.id, nm.item_name, nm.dept_id, nm.prefix_question, nm.sort_num, nm.del_flag, nm.create_by, nm.create_time,
-		       nm.update_by, nm.update_time, nm.contacts, nm.contacts_phone, d.dept_name
+		       nm.update_by, nm.update_time, nm.contacts, nm.contacts_phone, nm.common_problem, d.dept_name
 		FROM nasc_matter nm
         LEFT JOIN sys_dept d ON nm.dept_id = d.dept_id
         WHERE nm.del_flag != -1
@@ -70,14 +71,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="insertMatter" parameterType="NascMatter" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO nasc_matter (item_name, dept_id, prefix_question, contacts, contacts_phone, sort_num, create_by, create_time)
-        VALUES (#{itemName}, #{deptId}, #{prefixQuestion}, #{contacts}, #{contactsPhone}, #{sortNum}, #{createBy}, sysdate())
+        INSERT INTO nasc_matter (item_name, dept_id, prefix_question, contacts, contacts_phone, common_problem, sort_num, create_by, create_time)
+        VALUES (#{itemName}, #{deptId}, #{prefixQuestion}, #{contacts}, #{contactsPhone}, #{commonProblem}, #{sortNum}, #{createBy}, sysdate())
     </insert>
 
     <update id="updateMatter" parameterType="NascMatter">
         UPDATE nasc_matter
         SET item_name = #{itemName}, dept_id = #{deptId}, prefix_question = #{prefixQuestion}, sort_num = #{sortNum},
-            contacts = #{contacts}, contacts_phone = #{contactsPhone}, update_by = #{updateBy}, update_time = sysdate()
+            contacts = #{contacts}, contacts_phone = #{contactsPhone}, common_problem = #{commonProblem}, update_by = #{updateBy}, update_time = sysdate()
         WHERE id = #{id}
     </update>
 
@@ -91,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <select id="getMatterInfo" parameterType="NascMatter" resultMap="matterResult">
-        SELECT nm.id, nm.item_name, nm.dept_id, nm.prefix_question, nm.contacts, nm.contacts_phone, nm.sort_num, nm.del_flag, nm.create_by, nm.create_time, nm.update_by, nm.update_time,
+        SELECT nm.id, nm.item_name, nm.dept_id, nm.prefix_question, nm.contacts, nm.contacts_phone, nm.common_problem, nm.sort_num, nm.del_flag, nm.create_by, nm.create_time, nm.update_by, nm.update_time,
                d.dept_name, d.dept_id, d.parent_id,
                np.id AS printId, np.matter_id, np.content, np.miss_content, np.deny_content, np.disposable_content, np.print_by, np.print_time
         FROM nasc_matter nm

+ 5 - 0
nasc-ui/src/views/matter/index/index.vue

@@ -160,6 +160,10 @@
                     </el-table>
                   </div>
                 </el-row>
+                <el-row style="margin-top: 20px;">
+                  <label style="color: #00afff;">四、常见问题</label>
+                  <div class="matter-material" v-html="currMatter.commonProblem"></div>
+                </el-row>
               </el-form>
               <!--              <el-row style="margin-top: 20px;">-->
               <!--                <label style="color: #00afff;">四、材料说明</label>-->
@@ -663,6 +667,7 @@ export default {
       content = content.replace(/{\$matter}/g, this.currMatter.itemName)
       // const username = Cookies.get("username");
       content = content.replace(/{\$dealWithUser}/g, this.name)
+      content = content.replace(/{\$dealWithUserPhone}/g, this.currMatter.contactsPhone == '-' ? "" : this.currMatter.contactsPhone)
       let approveUser = ''
       if (this.dealWithForm.withType == 1) {
         approveUser = this.dealWithForm.contacts

+ 11 - 0
nasc-ui/src/views/matter/item/index.vue

@@ -133,6 +133,13 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="24">
+            <el-form-item label="常见问题" prop="commonProblem">
+              <editor v-model="formData.commonProblem" :min-height="152" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span=" 24">
             <el-form-item label="前置问题" prop="prefixQuestion">
               <el-radio-group v-model="formData.prefixQuestion" @change="handleVersionChange">
@@ -1053,6 +1060,7 @@
             sort: data.sortNum,
             prefixQuestion: data.prefixQuestion,
             conditions: data.material ? data.material.conditions : "",
+            commonProblem: data.commonProblem ? data.commonProblem : "",
             dealWith: data.material ? data.material.dealWith : "",
             materialList: material,
             printContent: data.print ? data.print.content : "",
@@ -1309,6 +1317,7 @@
                 contacts: data.contacts,
                 contactsPhone: data.contactsPhone,
                 sortNum: data.sort,
+                commonProblem: data.commonProblem,
                 prefixQuestion: data.prefixQuestion,
                 print: {
                   id: data.printid,
@@ -1337,6 +1346,7 @@
                 itemName: data.itemName,
                 contacts: data.contacts,
                 contactsPhone: data.contactsPhone,
+                commonProblem: data.commonProblem,
                 sortNum: data.sort,
                 prefixQuestion: data.prefixQuestion,
                 material: {
@@ -1432,6 +1442,7 @@
           sort: '',
           prefixQuestion: '',
           conditions: '',
+          commonProblem: '',
           dealWith: '',
           material: '',
           desc: '',

+ 2 - 2
sql/p_bysltzs.html

@@ -78,10 +78,10 @@
             受理人:{$dealWithUser}
         </p>
         <p>
-            联系电话:023-00000000
+            联系电话:{$dealWithUserPhone}
         </p>
         <p>
-            监督投诉电话:023-00000000
+            监督投诉电话:
         </p>
     </div>
     <p class="ql-align-right" style=" text-align: right;">

+ 2 - 2
sql/p_bzclgzs.html

@@ -78,10 +78,10 @@
             受理人:{$dealWithUser}
         </p>
         <p>
-            联系电话:023-00000000
+            联系电话:{$dealWithUserPhone}
         </p>
         <p>
-            监督投诉电话:023-00000000
+            监督投诉电话:
         </p>
     </div>
     <p class="ql-align-right" style=" text-align: right;">

+ 2 - 2
sql/p_sltzd.html

@@ -74,10 +74,10 @@
             受理人:{$dealWithUser}
         </p>
         <p>
-            联系电话:023-00000000
+            联系电话:{$dealWithUserPhone}
         </p>
         <p>
-            监督投诉电话:023-00000000
+            监督投诉电话:
         </p>
     </div>
     <p style=" text-indent: 2em;">