Merge remote-tracking branch 'origin/master'

src/main/resources/static/js/system/processes.js

@@ -23,7 +23,8 @@ layui.config({
         params = {
             encryptedData: encryptCBC(JSON.stringify(params))
         }
-        ajaxRequest(url, "POST", params, true, function () {}, function (result) {
+        ajaxRequest(url, "POST", params, true, function () {
+        }, function (result) {
             console.log(result)
             reloadData();
             if (result.status === 200) {
@@ -89,7 +90,8 @@ function initTable(dataList, limit, page) {
         cols: [
             [
                 //表头
-                {title: "序号", width: 80, unresize: true, align: "center",
+                {
+                    title: "序号", width: 80, unresize: true, align: "center",
                     templet: function (d) {
                         return (page - 1) * limit + d.LAY_INDEX;
                     }
@@ -98,7 +100,8 @@ function initTable(dataList, limit, page) {
                 {field: "processName", title: "工序", unresize: true, align: "center"},
                 {field: "status", title: "状态", align: "center", templet: '#is-state'},
                 {field: "createTime", title: "创建时间", align: "center", templet: 'center'},
-                {title: "操作", unresize: true, width: 300, align: "center",
+                {
+                    title: "操作", unresize: true, width: 300, align: "center",
                     templet: function (d) {
 
                         let html = '';
@@ -127,21 +130,15 @@ function initTable(dataList, limit, page) {
 // 获取参数
 function getReqParams(page, limit, type) {
     let obj = {};
-    if (!type) {
+    if (type === 2) {
+        $('#keyWord').val('')
+        layui.form.render();
+    }
     obj = {
         page: page + "",
         limit: limit + "",
         keyWord: $('#keyWord').val(),
-
     };
-    } else {
-        obj = {
-            page: '1',
-            limit: '10',
-            keyWord: '',
-        };
-    }
-    console.log(obj)
     obj={
         encryptedData:encryptCBC(JSON.stringify(obj))
     }
@@ -151,7 +148,7 @@ function getReqParams(page, limit, type) {
 // 查询/重置
 function query(type) {
     pageNum = 1;
-    pages(1, limitSize);
+    pages(1, limitSize, type);
 }
 
 
@@ -173,6 +170,7 @@ function reloadData() {
     }
     openIframe2("addMajorTemp", title, "child/addMajorForm.html", '800px', '200px', param);
 }*/
+
 //新增/修改工序
 function addProcesses(processId) {
     let title = '新增工序'

src/main/resources/static/js/system/userMge.js

@@ -144,20 +144,15 @@ function initTable(dataList, limit, page) {
 // 获取参数
 function getReqParams(page, limit, type) {
     let obj = {};
-    if (!type) {
+    if (type === 2) {
+        $('#keyWord').val('')
+        layui.form.render();
+    }
     obj = {
         page: page + "",
         limit: limit + "",
         keyWord: $('#keyWord').val(),
     };
-    } else {
-        obj = {
-            page: '1',
-            limit: '10',
-            keyWord: '',
-        };
-    }
-    console.log(obj)
     obj={
         encryptedData:encryptCBC(JSON.stringify(obj))
     }
@@ -182,7 +177,7 @@ function query(type) {
         });
     }*/
     pageNum = 1;
-    pages(1, limitSize);
+    pages(1, limitSize,type);
 }
 
 

src/main/resources/static/pages/processes/processes.html

@@ -30,7 +30,7 @@
                 <div class="layui-inline btns">
                     <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
                     </button>
-                    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="reset()">重置
+                    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(2)">重置
                     </button>
            <!--         <button type="button" class="layui-btn layui-btn-primary layui-btn-sm btn-2"
                             onclick="addMajor(null)">

src/main/resources/static/pages/user/userMge.html

@@ -50,7 +50,7 @@
                 <div class="layui-inline btns">
                     <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
                     </button>
-                    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="reset()">重置
+                    <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(2)">重置
                     </button>
                     <button type="button" class="layui-btn layui-btn-primary layui-btn-sm btn-2"
                             onclick="addDataTemp(null)">