Showing
11 changed files
with
40 additions
and
13 deletions
| @@ -101,6 +101,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -101,6 +101,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 101 | 101 | ||
| 102 | // 初始化下拉框 | 102 | // 初始化下拉框 |
| 103 | function loadSelect() { | 103 | function loadSelect() { |
| 104 | + | ||
| 104 | admin.req({ | 105 | admin.req({ |
| 105 | url: domainName + '/api-room/assetsrepair/findAssetsRepairList' | 106 | url: domainName + '/api-room/assetsrepair/findAssetsRepairList' |
| 106 | }).done(function (response) { | 107 | }).done(function (response) { |
| @@ -130,6 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -130,6 +131,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
| 130 | }); | 131 | }); |
| 131 | $('#slt-repairadd-res').html(options); | 132 | $('#slt-repairadd-res').html(options); |
| 132 | form.render(); | 133 | form.render(); |
| 134 | + fromAssignment() | ||
| 133 | }) | 135 | }) |
| 134 | 136 | ||
| 135 | } | 137 | } |
| @@ -23,8 +23,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate | @@ -23,8 +23,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts','laydate | ||
| 23 | 23 | ||
| 24 | //日期范围选择 | 24 | //日期范围选择 |
| 25 | laydate.render({ | 25 | laydate.render({ |
| 26 | - elem: '#dateLimit' | 26 | + elem: '#repairdateLimit' |
| 27 | ,range: '~', | 27 | ,range: '~', |
| 28 | + trigger: 'click', | ||
| 29 | + ready: function(date){ | ||
| 30 | + $("#repairdateLimit").removeAttr("lay-key"); | ||
| 31 | + $(this).attr("lay-key","1"); | ||
| 32 | + }, | ||
| 28 | done: function (value) { | 33 | done: function (value) { |
| 29 | dateLimit = value | 34 | dateLimit = value |
| 30 | if (dateLimit == '') { | 35 | if (dateLimit == '') { |
| @@ -22,8 +22,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -22,8 +22,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 22 | 22 | ||
| 23 | //日期范围选择 | 23 | //日期范围选择 |
| 24 | laydate.render({ | 24 | laydate.render({ |
| 25 | - elem: '#dateLimit' | ||
| 26 | - , range: '~', | 25 | + elem: '#devicedateLimit' |
| 26 | + ,range: '~', | ||
| 27 | + trigger: 'click', | ||
| 28 | + ready: function(date){ | ||
| 29 | + $("#devicedateLimit").removeAttr("lay-key"); | ||
| 30 | + $(this).attr("lay-key","1"); | ||
| 31 | + }, | ||
| 27 | done: function (value) { | 32 | done: function (value) { |
| 28 | dateLimit = value | 33 | dateLimit = value |
| 29 | if (dateLimit == '') { | 34 | if (dateLimit == '') { |
| @@ -20,8 +20,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -20,8 +20,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 20 | 20 | ||
| 21 | //日期范围选择 | 21 | //日期范围选择 |
| 22 | laydate.render({ | 22 | laydate.render({ |
| 23 | - elem: '#dateLimit' | ||
| 24 | - , range: '~', | 23 | + elem: '#staffdateLimit' |
| 24 | + ,range: '~', | ||
| 25 | + trigger: 'click', | ||
| 26 | + ready: function(date){ | ||
| 27 | + $("#staffdateLimit").removeAttr("lay-key"); | ||
| 28 | + $(this).attr("lay-key","1"); | ||
| 29 | + }, | ||
| 25 | done: function (value) { | 30 | done: function (value) { |
| 26 | dateLimit = value | 31 | dateLimit = value |
| 27 | if (dateLimit == '') { | 32 | if (dateLimit == '') { |
| @@ -19,8 +19,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -19,8 +19,13 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 19 | 19 | ||
| 20 | //日期范围选择 | 20 | //日期范围选择 |
| 21 | laydate.render({ | 21 | laydate.render({ |
| 22 | - elem: '#dateLimit' | ||
| 23 | - , range: '~', | 22 | + elem: '#routedateLimit' |
| 23 | + ,range: '~', | ||
| 24 | + trigger: 'click', | ||
| 25 | + ready: function(date){ | ||
| 26 | + $("#routedateLimit").removeAttr("lay-key"); | ||
| 27 | + $(this).attr("lay-key","1"); | ||
| 28 | + }, | ||
| 24 | done: function (value) { | 29 | done: function (value) { |
| 25 | dateLimit = value | 30 | dateLimit = value |
| 26 | if (dateLimit == '') { | 31 | if (dateLimit == '') { |
| @@ -45,7 +45,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -45,7 +45,12 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
| 45 | //日期范围选择 | 45 | //日期范围选择 |
| 46 | laydate.render({ | 46 | laydate.render({ |
| 47 | elem: '#dateLimit' | 47 | elem: '#dateLimit' |
| 48 | - , range: '~', | 48 | + ,range: '~', |
| 49 | + trigger: 'click', | ||
| 50 | + ready: function(date){ | ||
| 51 | + $("#dateLimit").removeAttr("lay-key"); | ||
| 52 | + $(this).attr("lay-key","1"); | ||
| 53 | + }, | ||
| 49 | done: function (value) { | 54 | done: function (value) { |
| 50 | dateLimit = value | 55 | dateLimit = value |
| 51 | if (dateLimit == '') { | 56 | if (dateLimit == '') { |
| @@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
| 63 | </div> | 63 | </div> |
| 64 | <div class="layui-inline" style="margin-left: 10px"> | 64 | <div class="layui-inline" style="margin-left: 10px"> |
| 65 | <div class="layui-input-inline" style="width: auto"> | 65 | <div class="layui-input-inline" style="width: auto"> |
| 66 | - <input type="text" name="dateLimit" id="dateLimit" autocomplete="off" | 66 | + <input type="text" name="dateLimit" id="repairdateLimit" autocomplete="off" |
| 67 | class="layui-input" readonly placeholder="其他日期范围"> | 67 | class="layui-input" readonly placeholder="其他日期范围"> |
| 68 | </div> | 68 | </div> |
| 69 | </div> | 69 | </div> |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | </div> | 39 | </div> |
| 40 | <div class="layui-inline" style="margin-left: 10px"> | 40 | <div class="layui-inline" style="margin-left: 10px"> |
| 41 | <div class="layui-input-inline" style="width: auto"> | 41 | <div class="layui-input-inline" style="width: auto"> |
| 42 | - <input type="text" name="dateLimit" id="dateLimit" autocomplete="off" | 42 | + <input type="text" name="dateLimit" id="devicedateLimit" autocomplete="off" |
| 43 | class="layui-input" readonly placeholder="其他日期范围"> | 43 | class="layui-input" readonly placeholder="其他日期范围"> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | </div> | 39 | </div> |
| 40 | <div class="layui-inline" style="margin-left: 10px"> | 40 | <div class="layui-inline" style="margin-left: 10px"> |
| 41 | <div class="layui-input-inline" style="width: auto"> | 41 | <div class="layui-input-inline" style="width: auto"> |
| 42 | - <input type="text" name="dateLimit" id="dateLimit" autocomplete="off" | 42 | + <input type="text" name="dateLimit" id="staffdateLimit" autocomplete="off" |
| 43 | class="layui-input" readonly placeholder="其他日期范围"> | 43 | class="layui-input" readonly placeholder="其他日期范围"> |
| 44 | </div> | 44 | </div> |
| 45 | </div> | 45 | </div> |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | </div> | 56 | </div> |
| 57 | <div class="layui-inline" style="margin-left: 10px"> | 57 | <div class="layui-inline" style="margin-left: 10px"> |
| 58 | <div class="layui-input-inline" style="width: auto"> | 58 | <div class="layui-input-inline" style="width: auto"> |
| 59 | - <input type="text" name="dateLimit" id="dateLimit" autocomplete="off" | 59 | + <input type="text" name="dateLimit" id="routedateLimit" autocomplete="off" |
| 60 | class="layui-input" readonly placeholder="日期范围"> | 60 | class="layui-input" readonly placeholder="日期范围"> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| @@ -112,7 +112,7 @@ | @@ -112,7 +112,7 @@ | ||
| 112 | <!-- <div class="pie-chart" id="chart-noRead-report"></div>--> | 112 | <!-- <div class="pie-chart" id="chart-noRead-report"></div>--> |
| 113 | </div> | 113 | </div> |
| 114 | </div> | 114 | </div> |
| 115 | - <div class="layui-card-body" style="margin-top: 10px;"> | 115 | + <div class="layui-card-body" style="margin-top: 30px;"> |
| 116 | <div class="warn-btns"> | 116 | <div class="warn-btns"> |
| 117 | <!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-read"> | 117 | <!--<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-workreport-set-read"> |
| 118 | <i class="layui-icon"></i>勾选标记为已读 | 118 | <i class="layui-icon"></i>勾选标记为已读 |
-
Please register or login to post a comment