diff --git a/src/main/resources/static/js/JcPrinter/layer/layer.js b/src/main/resources/static/js/JcPrinter/layer/layer.js index 3cc95784..57127f65 100644 --- a/src/main/resources/static/js/JcPrinter/layer/layer.js +++ b/src/main/resources/static/js/JcPrinter/layer/layer.js @@ -81,10 +81,14 @@ }, n)) } }, s = function (e) { - var t = this, a = function () { + var t = this, + a = function () { t.creat() }; - t.index = ++r.index, t.config.maxWidth = i(n).width() - 30, t.config = i.extend({}, t.config, o.config, e), document.body ? a() : setTimeout(function () { + t.index = ++r.index, + t.config.maxWidth = i(n).width() - 30, + t.config = i.extend({}, t.config, o.config, e), + document.body ? a() : setTimeout(function () { a() }, 30) }; diff --git a/src/main/resources/static/lib/layui-v2.6.3/layui.js b/src/main/resources/static/lib/layui-v2.6.3/layui.js index e5df1dc9..b8d872fc 100644 --- a/src/main/resources/static/lib/layui-v2.6.3/layui.js +++ b/src/main/resources/static/lib/layui-v2.6.3/layui.js @@ -3698,12 +3698,20 @@ layui.define(function (e) { }, n)) } }, s = function (e) { - var t = this, a = function () { + + var t = this, + + a = function () { r.ready(function () { t.creat() }) }; - t.index = ++r.index, t.config.maxWidth = i(n).width() - 30, t.config = i.extend({}, t.config, o.config, e), document.body ? a() : setTimeout(function () { + + + t.index = ++r.index, + t.config.maxWidth = i(n).width() - 30, + t.config = i.extend({}, t.config, o.config, e), + document.body ? a() : setTimeout(function () { a() }, 30) }; @@ -4136,6 +4144,7 @@ layui.define(function (e) { }, o.run = function (t) { i = t, n = i(e), l.html = i("html"), r.open = function (e) { var t = new s(e); + console.log(t) return t.index } }, e.layui && layui.define ? (r.ready(), layui.define("jquery", function (t) { diff --git a/src/main/resources/templates/pages/application/my-task.html b/src/main/resources/templates/pages/application/my-task.html index 5700ca5c..2f3b84a6 100644 --- a/src/main/resources/templates/pages/application/my-task.html +++ b/src/main/resources/templates/pages/application/my-task.html @@ -26,47 +26,50 @@ } -
- - - -
-
-
-
    -
  • 审核任务
    • -
  • 出库任务
    • -
-
-
-
    -
    -
    -
      + +
      +
      + + +
        +
      • 未完成任务
        • +
      • 已完成任务
        • +
      +
      +
      +
      +
        +
      • 审核任务
        • +
      • 出库任务
        • +
      +
      +
      +
        +
        +
        +
          +
          +
          -
          -
          -
          -
          -
            -
          • 审核任务
            • -
          • 出库任务
            • -
          -
          -
          -
            -
            -
            -
              +
              +
              +
                +
              • 审核任务
                • +
              • 出库任务
                • +
              +
              +
              +
                +
                +
                +
                  +
                  +
                  -
                  diff --git a/src/main/resources/templates/pages/other/welcome_mobile.html b/src/main/resources/templates/pages/other/welcome_mobile.html index 6788c0b2..5893e8ed 100644 --- a/src/main/resources/templates/pages/other/welcome_mobile.html +++ b/src/main/resources/templates/pages/other/welcome_mobile.html @@ -466,7 +466,8 @@ $(window).on("resize", function () { layer.full(index); }); - } else if (type === "物料出库请求") { + } + else if (type === "物料出库请求") { var index = layer.open({ title: '请求详情', type: 2, @@ -497,25 +498,20 @@ area: ['100%', '100%'], content: '/noticeAll', }); - } + }; showAllMyTask = function () { - layer.open({ + var index = layer.open({ + title: '我的任务', type: 2, - title: '弹窗内容', - skin: 'layui-layer-rim', + shade: 0.2, maxmin: true, - shadeClose: true, //点击遮罩关闭层 + shadeClose: true, area: ['100%', '100%'], - move: '.layui-layer-title', - fixed: false, content: '/my_task', }); - } + }; - $('body').on('click', '[data-refresh]', function () { - location.reload(); - }) }); diff --git a/src/main/resources/templates/pages/self/message.html b/src/main/resources/templates/pages/self/message.html index 9291be37..fe59bcf1 100644 --- a/src/main/resources/templates/pages/self/message.html +++ b/src/main/resources/templates/pages/self/message.html @@ -435,36 +435,31 @@ }; showAllMyTask = function () { - layer.open({ - type: 2, + var index = layer.open({ title: '我的任务', - skin: 'layui-layer-rim', + type: 2, + shade: 0.2, maxmin: true, - shadeClose: true, //点击遮罩关闭层 + shadeClose: true, area: ['100%', '100%'], - move: '.layui-layer-title', - fixed: false, content: '/my_task', }); - } + }; showAllMyApply = function () { - layer.open({ + + var index = layer.open({ + title: '我的任务', type: 2, - title: '我的申请', - skin: 'layui-layer-rim', + shade: 0.2, maxmin: true, - shadeClose: true, //点击遮罩关闭层 + shadeClose: true, area: ['100%', '100%'], - move: '.layui-layer-title', - fixed: false, content: '/my_apply', }); - } + }; + - $('body').on('click', '[data-refresh]', function () { - location.reload(); - }) });