diff --git a/src/main/java/lingtao/net/bean/StandardMemo.java b/src/main/java/lingtao/net/bean/StandardMemo.java index 058e301..fd6a5aa 100644 --- a/src/main/java/lingtao/net/bean/StandardMemo.java +++ b/src/main/java/lingtao/net/bean/StandardMemo.java @@ -6,26 +6,29 @@ import java.util.Date; /** * 产品知识点； - * - * @author Administrator * + * @author Administrator */ @Data public class StandardMemo { - private Integer id; + private Integer id; - private String content; + private String content; - private String createBy; + private String createBy; - private Date createDate; + private Date createDate; - private String updateBy; + private String updateBy; - private Date updateDate; - /** - * 附件 - */ - private String title; + private Date updateDate; + /** + * 附件 + */ + private String title; + /** + * 描述 + */ + private String memo; } diff --git a/src/main/resources/mapper/InformationMapper.xml b/src/main/resources/mapper/InformationMapper.xml index 076f13b..f4f96d9 100644 --- a/src/main/resources/mapper/InformationMapper.xml +++ b/src/main/resources/mapper/InformationMapper.xml @@ -12,6 +12,9 @@ content like '%${content}%' + + type = '${type}' + order by id diff --git a/src/main/resources/mapper/StandardMemoMapper.xml b/src/main/resources/mapper/StandardMemoMapper.xml index a52efc6..8ec97f1 100644 --- a/src/main/resources/mapper/StandardMemoMapper.xml +++ b/src/main/resources/mapper/StandardMemoMapper.xml @@ -17,8 +17,8 @@ insert into tbl_standard_memo - (content, createBy, createDate, title) - values (#{content}, #{createBy}, now(), #{title}) + (content, createBy, createDate, title, memo) + values (#{content}, #{createBy}, now(), #{title}, #{memo}) @@ -36,6 +36,9 @@ title = #{title,jdbcType=VARCHAR}, + + memo = #{memo,jdbcType=VARCHAR}, + where id = #{id,jdbcType=INTEGER} diff --git a/src/main/webapp/js/information.js b/src/main/webapp/js/information.js index 8c8cd96..de05d1c 100644 --- a/src/main/webapp/js/information.js +++ b/src/main/webapp/js/information.js @@ -22,7 +22,7 @@ layui.use(['element', 'table', 'laydate', 'form'], function () { 'limitName' : 'pageSize' // 分页每页条数默认字段改为pageSize },*/ where: { - content: '' + type: '1',content: '' }, cellMinWidth: 80, // 全局定义常规单元格的最小宽度，layui 2.2.1 新增 cols: [[{ diff --git a/src/main/webapp/views/system/customerTrain/knowledge/showCustomerKnowledgeContent.jsp b/src/main/webapp/views/system/customerTrain/knowledge/showCustomerKnowledgeContent.jsp index f44de6b..07dc3cb 100644 --- a/src/main/webapp/views/system/customerTrain/knowledge/showCustomerKnowledgeContent.jsp +++ b/src/main/webapp/views/system/customerTrain/knowledge/showCustomerKnowledgeContent.jsp @@ -105,7 +105,7 @@ 'limitName' : 'pageSize' // 分页每页条数默认字段改为pageSize },*/ where: { - content: '' + content: '', type: "1" }, cellMinWidth: 80, // 全局定义常规单元格的最小宽度，layui 2.2.1 新增 cols: [[{ diff --git a/src/main/webapp/views/system/customerTrain/skill/addMemo.jsp b/src/main/webapp/views/system/customerTrain/skill/addMemo.jsp new file mode 100644 index 0000000..2388e9b --- /dev/null +++ b/src/main/webapp/views/system/customerTrain/skill/addMemo.jsp @@ -0,0 +1,90 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + 添加产品须知 + <%@include file="/views/common.jsp" %> + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ + +
+
+
+
+ + + \ No newline at end of file diff --git a/src/main/webapp/views/system/customerTrain/skill/showCustomerSkillContent.jsp b/src/main/webapp/views/system/customerTrain/skill/showCustomerSkillContent.jsp index c6c8e7b..0451e13 100644 --- a/src/main/webapp/views/system/customerTrain/skill/showCustomerSkillContent.jsp +++ b/src/main/webapp/views/system/customerTrain/skill/showCustomerSkillContent.jsp @@ -39,7 +39,9 @@ 复制 - + + 修改 +
@@ -90,29 +92,14 @@ }, cellMinWidth: 80, // 全局定义常规单元格的最小宽度，layui 2.2.1 新增 cols: [[{ - type: 'numbers', - title: '序号', - width: 50, - fixed: "left" - }, { field: 'title', - title: '标题', + title: '产品', }, { field: 'content', title: '内容', }, { - field: 'createBy', - align: 'center', - width: 150, - title: '创建人' - }, { - field: 'createDate', - title: '创建时间', - width: 220, - align: 'center', - templet: function (d) { - return d.createDate != null ? layui.util.toDateString(d.createDate, "yyyy-MM-dd HH:mm:ss") : ""; - } + field: 'memo', + title: '备注', }, { fixed: 'right', title: '操作', @@ -145,9 +132,42 @@ }); + table.on('toolbar(informationTable)', function (obj) { + switch (obj.event) { + case 'add': + layer.open({ + type: 2, + title: "添加文件名", + fix: false, //不固定 + maxmin: true, + skin: 'layui-layer-molv', + area: ['45%', '70%'], + content: './addMemo.jsp', + }); + break; + } + ; + }); table.on('tool(informationTable)', function (obj) { - let data = obj.data; - if (obj.event === 'view') { + let data1 = obj.data; + if (obj.event === 'edit') { + layer.open({ + type: 2, + title: "修改文件名", + area: ['45%', '70%'], + skin: 'layui-layer-molv', + content: './addMemo.jsp', + success: function (layero, index) { + var body = layer.getChildFrame('body', index); + body.find('#id').val(data1.id); + body.find('input[name="title"]').val(data1.title); + body.find('input[name="memo"]').val(data1.memo); + body.find('textarea[name="content"]').val(data1.content); + + layui.form.render(); + } + }); + } else if (obj.event === 'view') { // 在此处输入 layer 的任意代码 navigator.clipboard.writeText(data.content); layer.msg('复制成功！', {icon: 6, offset: 'auto', time: 1000}); diff --git a/src/main/webapp/views/system/instructions/manage/printing.jsp b/src/main/webapp/views/system/instructions/manage/printing.jsp index 9e08a3b..cb7e005 100644 --- a/src/main/webapp/views/system/instructions/manage/printing.jsp +++ b/src/main/webapp/views/system/instructions/manage/printing.jsp @@ -62,7 +62,12 @@ -
+
+
@@ -52,6 +52,11 @@
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/views/system/report/manage/quality.jsp b/src/main/webapp/views/system/report/manage/quality.jsp new file mode 100644 index 0000000..a8e0569 --- /dev/null +++ b/src/main/webapp/views/system/report/manage/quality.jsp @@ -0,0 +1,266 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + 产品知识列表 + <%@include file="/views/common.jsp" %> + + + + + + +
+
+
+ +
+ +
+
+
+
+ + +
+
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/views/system/report/reveal/quality.jsp b/src/main/webapp/views/system/report/reveal/quality.jsp new file mode 100644 index 0000000..11c17fe --- /dev/null +++ b/src/main/webapp/views/system/report/reveal/quality.jsp @@ -0,0 +1,174 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8" %> +<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + + + 产品知识列表 + <%@include file="/views/common.jsp" %> + + + + + + +
+
+
+ +
+ +
+
+
+
+ + +
+
+
+
+ + + + \ No newline at end of file