测试bug问题处理(禅道1169~1179)
Showing
15 changed files
with
138 additions
and
107 deletions
@@ -66,14 +66,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -66,14 +66,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
66 | time: 1000, | 66 | time: 1000, |
67 | }, function () { | 67 | }, function () { |
68 | layer.closeAll() | 68 | layer.closeAll() |
69 | - table.reload('table-repair-view', { | ||
70 | - where: { | ||
71 | - access_token: accessToken, | ||
72 | - createtime: "today", | ||
73 | - viewMode: 'true', | ||
74 | - dateLimit: "" | ||
75 | - }, | ||
76 | - }); | 69 | + var evt = $.Event('keydown', {keyCode: 13}); |
70 | + $('#monitor_keyword').trigger(evt); | ||
71 | + // table.reload('table-repair-view', { | ||
72 | + // where: { | ||
73 | + // access_token: accessToken, | ||
74 | + // createtime: "today", | ||
75 | + // viewMode: 'true', | ||
76 | + // dateLimit: "" | ||
77 | + // }, | ||
78 | + // }); | ||
77 | }) | 79 | }) |
78 | } else { | 80 | } else { |
79 | layer.msg(res.msg, { | 81 | layer.msg(res.msg, { |
@@ -292,7 +294,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -292,7 +294,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
292 | //写入标签内容 | 294 | //写入标签内容 |
293 | function writeTagsInfo(id, name) { | 295 | function writeTagsInfo(id, name) { |
294 | var tags = '<span id="tags_span_' + id + '" data-id="' + id + '"><em>' + name + '</em>' + | 296 | var tags = '<span id="tags_span_' + id + '" data-id="' + id + '"><em>' + name + '</em>' + |
295 | - '<button type="button" value="' + id + '" class="tags close">×</button></span>'; | 297 | + '<button type="button" value="' + id + '" class="tagsclose">×</button></span>'; |
296 | if ($("#tags_span_" + id).length == 0) { | 298 | if ($("#tags_span_" + id).length == 0) { |
297 | //拼接标签 | 299 | //拼接标签 |
298 | $("#selecte_content_id").append(tags); | 300 | $("#selecte_content_id").append(tags); |
@@ -304,7 +306,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | @@ -304,7 +306,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect | ||
304 | //删除标签事件 | 306 | //删除标签事件 |
305 | function bindTagesDelEvent() { | 307 | function bindTagesDelEvent() { |
306 | //删除已选主体的页签 | 308 | //删除已选主体的页签 |
307 | - $("button.tagsclose").on("click", function () { | 309 | + $("button.tagsclose").unbind('click').on("click", function () { |
308 | var attachId = $(this).attr("value"); | 310 | var attachId = $(this).attr("value"); |
309 | //确认提示框 | 311 | //确认提示框 |
310 | layer.confirm('附件删除后将无法恢复,您确定要删除吗?', { | 312 | layer.confirm('附件删除后将无法恢复,您确定要删除吗?', { |
@@ -175,7 +175,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -175,7 +175,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
175 | 175 | ||
176 | var title = '附件' | 176 | var title = '附件' |
177 | 177 | ||
178 | - common.openWin('assets/repairlist', title, {id: id, type: type}, ['确定', '取消']) | 178 | + common.openWin('assets/repairlist', title, {id: id, type: type}) |
179 | } | 179 | } |
180 | 180 | ||
181 | //监听单元格事件 | 181 | //监听单元格事件 |
@@ -63,7 +63,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -63,7 +63,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
63 | 63 | ||
64 | form.on('select(slt-actionType)', function (data) { | 64 | form.on('select(slt-actionType)', function (data) { |
65 | if (data.value == "3") { | 65 | if (data.value == "3") { |
66 | - $("#lastPlace").removeAttribute("readOnly"); | 66 | + //当迁移时,设置readOnly为false joke modify 20221121 |
67 | + // $("#lastPlace").removeAttribute("readOnly"); | ||
68 | + $("#lastPlace").attr("readOnly", false); | ||
67 | } else { | 69 | } else { |
68 | $("#lastPlace").attr("readOnly", "readOnly"); | 70 | $("#lastPlace").attr("readOnly", "readOnly"); |
69 | } | 71 | } |
@@ -103,22 +105,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -103,22 +105,25 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
103 | time: 1000, | 105 | time: 1000, |
104 | }, function () { | 106 | }, function () { |
105 | layer.closeAll() | 107 | layer.closeAll() |
106 | - table.reload('enterdevice_table_id', { | ||
107 | - where: { | ||
108 | - access_token: accessToken, | ||
109 | - createtime: "month", | ||
110 | - viewMode: 'true', | ||
111 | - dateLimit: "" | ||
112 | - }, | ||
113 | - }); | ||
114 | - table.reload('fitting-table', { | ||
115 | - where: { | ||
116 | - access_token: accessToken, | ||
117 | - createtime: "month", | ||
118 | - viewMode: 'true', | ||
119 | - dateLimit: "" | ||
120 | - }, | ||
121 | - }); | 108 | + //模拟申请人回车事件,刷新父页面 |
109 | + var evt = $.Event('keydown', {keyCode: 13}); | ||
110 | + $('#applyUserDevice').trigger(evt); | ||
111 | + // table.reload('enterdevice_table_id', { | ||
112 | + // where: { | ||
113 | + // access_token: accessToken, | ||
114 | + // createtime: "month", | ||
115 | + // viewMode: 'true', | ||
116 | + // dateLimit: "" | ||
117 | + // }, | ||
118 | + // }); | ||
119 | + // table.reload('fitting-table', { | ||
120 | + // where: { | ||
121 | + // access_token: accessToken, | ||
122 | + // createtime: "month", | ||
123 | + // viewMode: 'true', | ||
124 | + // dateLimit: "" | ||
125 | + // }, | ||
126 | + // }); | ||
122 | 127 | ||
123 | }) | 128 | }) |
124 | } else { | 129 | } else { |
@@ -278,7 +283,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | @@ -278,7 +283,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' | ||
278 | $.each(response.data, function (i, v) { | 283 | $.each(response.data, function (i, v) { |
279 | options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" | 284 | options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" |
280 | }); | 285 | }); |
281 | - options += "<option value='0'>其他</option>"; | ||
282 | $('#slt-staffadd-group').html(options); | 286 | $('#slt-staffadd-group').html(options); |
283 | form.render(); | 287 | form.render(); |
284 | }); | 288 | }); |
@@ -77,14 +77,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -77,14 +77,14 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
77 | }); | 77 | }); |
78 | 78 | ||
79 | // 回车搜索 | 79 | // 回车搜索 |
80 | - $('[lay-filter="form-enterStaff-condition"] input').keydown(function (e) { | 80 | + $('[lay-filter="form-enterDevice-condition"] input').keydown(function (e) { |
81 | if (e.keyCode === 13) { | 81 | if (e.keyCode === 13) { |
82 | reloadAllChange(); | 82 | reloadAllChange(); |
83 | } | 83 | } |
84 | }); | 84 | }); |
85 | 85 | ||
86 | // 下拉框改变搜索 | 86 | // 下拉框改变搜索 |
87 | - form.on('select(slt-staff-group)', reloadAllChange); | 87 | + form.on('select(slt-device-group)', reloadAllChange); |
88 | 88 | ||
89 | // tab页切换事件 | 89 | // tab页切换事件 |
90 | element.on('tab(enterdevice-tab)', function (data) { | 90 | element.on('tab(enterdevice-tab)', function (data) { |
@@ -104,7 +104,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -104,7 +104,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
104 | 104 | ||
105 | // 加载配件更换表格 | 105 | // 加载配件更换表格 |
106 | function renderEnterDeviceListTable() { | 106 | function renderEnterDeviceListTable() { |
107 | - var conditions = form.val('form-enterStaff-condition'); | 107 | + var conditions = form.val('form-enterDevice-condition'); |
108 | 108 | ||
109 | Object.assign(conditions, { | 109 | Object.assign(conditions, { |
110 | access_token: accessToken, | 110 | access_token: accessToken, |
@@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -195,7 +195,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
195 | 195 | ||
196 | // 加载设备出入表格 | 196 | // 加载设备出入表格 |
197 | function renderFittingFixListTable() { | 197 | function renderFittingFixListTable() { |
198 | - var conditions = form.val('form-enterStaff-condition'); | 198 | + var conditions = form.val('form-enterDevice-condition'); |
199 | 199 | ||
200 | Object.assign(conditions, { | 200 | Object.assign(conditions, { |
201 | access_token: accessToken, | 201 | access_token: accessToken, |
@@ -304,7 +304,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -304,7 +304,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
304 | 304 | ||
305 | var title = '更换配件列表' | 305 | var title = '更换配件列表' |
306 | 306 | ||
307 | - common.openWin('machineroom/fittingList', title, {id: id}, ['确定', '取消']) | 307 | + common.openWin('machineroom/fittingList', title, {id: id}) |
308 | } | 308 | } |
309 | 309 | ||
310 | //查看进出设备列表 | 310 | //查看进出设备列表 |
@@ -312,7 +312,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -312,7 +312,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
312 | 312 | ||
313 | var title = '出入设备列表' | 313 | var title = '出入设备列表' |
314 | 314 | ||
315 | - common.openWin('machineroom/deviceList', title, {id: id}, ['确定', '取消']) | 315 | + common.openWin('machineroom/deviceList', title, {id: id}) |
316 | } | 316 | } |
317 | 317 | ||
318 | // 加载查询条件下拉框 | 318 | // 加载查询条件下拉框 |
@@ -324,8 +324,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -324,8 +324,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
324 | $.each(response.data, function (i, v) { | 324 | $.each(response.data, function (i, v) { |
325 | options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" | 325 | options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" |
326 | }); | 326 | }); |
327 | - options += "<option value='0'>其他</option>"; | ||
328 | - $('#slt-staff-group').html(options); | 327 | + $('#slt-device-group').html(options); |
329 | form.render(); | 328 | form.render(); |
330 | }); | 329 | }); |
331 | } | 330 | } |
@@ -86,7 +86,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -86,7 +86,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
86 | // 加载工作汇报表格 | 86 | // 加载工作汇报表格 |
87 | function loadWorkReportTable() { | 87 | function loadWorkReportTable() { |
88 | var conditions = form.val('form-enterStaff-condition'); | 88 | var conditions = form.val('form-enterStaff-condition'); |
89 | - | ||
90 | Object.assign(conditions, { | 89 | Object.assign(conditions, { |
91 | access_token: accessToken, | 90 | access_token: accessToken, |
92 | createtime: createTime, | 91 | createtime: createTime, |
@@ -174,7 +173,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -174,7 +173,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
174 | 173 | ||
175 | var title = '进入人员列表' | 174 | var title = '进入人员列表' |
176 | 175 | ||
177 | - common.openWin('machineroom/staffList', title, {id: id}, ['确定', '取消']) | 176 | + common.openWin('machineroom/staffList', title, {id: id}) |
178 | } | 177 | } |
179 | 178 | ||
180 | // 加载查询条件下拉框 | 179 | // 加载查询条件下拉框 |
@@ -186,7 +185,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -186,7 +185,6 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
186 | $.each(response.data, function (i, v) { | 185 | $.each(response.data, function (i, v) { |
187 | options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" | 186 | options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>" |
188 | }); | 187 | }); |
189 | - options += "<option value='0'>其他</option>"; | ||
190 | $('#slt-staff-group').html(options); | 188 | $('#slt-staff-group').html(options); |
191 | form.render(); | 189 | form.render(); |
192 | }); | 190 | }); |
@@ -64,7 +64,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -64,7 +64,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
64 | userName: $('#userName').val(), | 64 | userName: $('#userName').val(), |
65 | theirType: $('#theirType').val(), | 65 | theirType: $('#theirType').val(), |
66 | }, | 66 | }, |
67 | - height: 'full-300', | 67 | + height: 'full-200', |
68 | page: { | 68 | page: { |
69 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 69 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
70 | , theme: '#1E9FFF'//自定义分页主题颜色 | 70 | , theme: '#1E9FFF'//自定义分页主题颜色 |
@@ -57,14 +57,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | @@ -57,14 +57,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail', 'sess | ||
57 | time: 1000, | 57 | time: 1000, |
58 | }, function () { | 58 | }, function () { |
59 | layer.closeAll() | 59 | layer.closeAll() |
60 | - table.reload('table-staff-view', { | ||
61 | - where: { | ||
62 | - access_token: accessToken, | ||
63 | - createtime: "month", | ||
64 | - viewMode: 'true', | ||
65 | - dateLimit: "" | ||
66 | - }, | ||
67 | - }); | 60 | + //模拟申请人回车事件,刷新父页面 |
61 | + var evt = $.Event('keydown', {keyCode: 13}); | ||
62 | + $('#applyUser').trigger(evt); | ||
63 | + // table.reload('table-staff-view', { | ||
64 | + // where: { | ||
65 | + // access_token: accessToken, | ||
66 | + // createtime: "month", | ||
67 | + // viewMode: 'true', | ||
68 | + // dateLimit: "" | ||
69 | + // }, | ||
70 | + // }); | ||
68 | }) | 71 | }) |
69 | } else { | 72 | } else { |
70 | layer.msg(res.msg, { | 73 | layer.msg(res.msg, { |
@@ -75,7 +75,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | @@ -75,7 +75,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function | ||
75 | dateLimit: '', | 75 | dateLimit: '', |
76 | viewMode: false | 76 | viewMode: false |
77 | }, | 77 | }, |
78 | - height: 'full-300', | 78 | + height: 'full-200', |
79 | page: { | 79 | page: { |
80 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] | 80 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] |
81 | , theme: '#1E9FFF'//自定义分页主题颜色 | 81 | , theme: '#1E9FFF'//自定义分页主题颜色 |
@@ -184,7 +184,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | @@ -184,7 +184,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat | ||
184 | elem: '#table-workreport-view', | 184 | elem: '#table-workreport-view', |
185 | url: domainName + '/api-web/workreport/page', | 185 | url: domainName + '/api-web/workreport/page', |
186 | where: conditions, | 186 | where: conditions, |
187 | - height: 'full-360', | 187 | + height: 'full-180', |
188 | page: { | 188 | page: { |
189 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'], | 189 | layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'], |
190 | theme: '#1E9FFF' | 190 | theme: '#1E9FFF' |
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | <input hidden id="id" lay-verify="checkReportIsExist" name="id"> | 9 | <input hidden id="id" lay-verify="checkReportIsExist" name="id"> |
10 | <div class="layui-form-item"> | 10 | <div class="layui-form-item"> |
11 | <div class="layui-inline inline-half"> | 11 | <div class="layui-inline inline-half"> |
12 | - <label class="layui-form-label">设备类型</label> | 12 | + <label class="layui-form-label">设备类型<span style="color: red">*</span></label> |
13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
14 | <select id="slt-repairadd-res" lay-filter="slt-repairadd-res" | 14 | <select id="slt-repairadd-res" lay-filter="slt-repairadd-res" |
15 | lay-verify="required" name="resType"> | 15 | lay-verify="required" name="resType"> |
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | </div> | 18 | </div> |
19 | </div> | 19 | </div> |
20 | <div class="layui-inline inline-half"> | 20 | <div class="layui-inline inline-half"> |
21 | - <label class="layui-form-label">设备序列号</label> | 21 | + <label class="layui-form-label">设备序列号<span style="color: red">*</span></label> |
22 | <div class="layui-input-inline"> | 22 | <div class="layui-input-inline"> |
23 | <input class="layui-input" id="resourceSN" lay-verify="required" maxlength="25" name="resourceSN" | 23 | <input class="layui-input" id="resourceSN" lay-verify="required" maxlength="25" name="resourceSN" |
24 | type="text"> | 24 | type="text"> |
@@ -27,13 +27,13 @@ | @@ -27,13 +27,13 @@ | ||
27 | </div> | 27 | </div> |
28 | <div class="layui-form-item"> | 28 | <div class="layui-form-item"> |
29 | <div class="layui-inline inline-half"> | 29 | <div class="layui-inline inline-half"> |
30 | - <label class="layui-form-label">故障时间</label> | 30 | + <label class="layui-form-label">故障时间<span style="color: red">*</span></label> |
31 | <div class="layui-input-inline"> | 31 | <div class="layui-input-inline"> |
32 | <input class="layui-input" id="hitchtime" lay-verify="required" name="hitchtime" type="text"> | 32 | <input class="layui-input" id="hitchtime" lay-verify="required" name="hitchtime" type="text"> |
33 | </div> | 33 | </div> |
34 | </div> | 34 | </div> |
35 | <div class="layui-inline inline-half"> | 35 | <div class="layui-inline inline-half"> |
36 | - <label class="layui-form-label">维修时间</label> | 36 | + <label class="layui-form-label">维修时间<span style="color: red">*</span></label> |
37 | <div class="layui-input-inline"> | 37 | <div class="layui-input-inline"> |
38 | <input class="layui-input" id="createtime" lay-verify="required" name="createtime" type="text"> | 38 | <input class="layui-input" id="createtime" lay-verify="required" name="createtime" type="text"> |
39 | </div> | 39 | </div> |
@@ -41,13 +41,13 @@ | @@ -41,13 +41,13 @@ | ||
41 | </div> | 41 | </div> |
42 | <div class="layui-form-item hide" id="form-item-repTitle"> | 42 | <div class="layui-form-item hide" id="form-item-repTitle"> |
43 | <div class="layui-inline inline-half"> | 43 | <div class="layui-inline inline-half"> |
44 | - <label class="layui-form-label">标题</label> | 44 | + <label class="layui-form-label">标题<span style="color: red">*</span></label> |
45 | <div class="layui-input-inline"> | 45 | <div class="layui-input-inline"> |
46 | <input class="layui-input" name="title" type="text"> | 46 | <input class="layui-input" name="title" type="text"> |
47 | </div> | 47 | </div> |
48 | </div> | 48 | </div> |
49 | <div class="layui-inline inline-half"> | 49 | <div class="layui-inline inline-half"> |
50 | - <label class="layui-form-label">汇报人</label> | 50 | + <label class="layui-form-label">汇报人<span style="color: red">*</span></label> |
51 | <div class="layui-input-inline"> | 51 | <div class="layui-input-inline"> |
52 | <input class="layui-input" id="createUser" name="createBy" readonly="readonly" type="text"> | 52 | <input class="layui-input" id="createUser" name="createBy" readonly="readonly" type="text"> |
53 | </div> | 53 | </div> |
@@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
55 | </div> | 55 | </div> |
56 | <div class="layui-form-item"> | 56 | <div class="layui-form-item"> |
57 | <div class="layui-inline inline-half"> | 57 | <div class="layui-inline inline-half"> |
58 | - <label class="layui-form-label">归属单位</label> | 58 | + <label class="layui-form-label">归属单位<span style="color: red">*</span></label> |
59 | <div class="layui-input-inline"> | 59 | <div class="layui-input-inline"> |
60 | <select id="slt-repairadd-org" lay-filter="slt-repairadd-org" | 60 | <select id="slt-repairadd-org" lay-filter="slt-repairadd-org" |
61 | lay-verify="required" name="orgId"> | 61 | lay-verify="required" name="orgId"> |
@@ -64,7 +64,7 @@ | @@ -64,7 +64,7 @@ | ||
64 | </div> | 64 | </div> |
65 | </div> | 65 | </div> |
66 | <div class="layui-inline inline-half"> | 66 | <div class="layui-inline inline-half"> |
67 | - <label class="layui-form-label">选择厂商</label> | 67 | + <label class="layui-form-label">选择厂商<span style="color: red">*</span></label> |
68 | <div class="layui-input-inline"> | 68 | <div class="layui-input-inline"> |
69 | <select id="slt-repairadd-group" lay-filter="slt-repairadd-group" | 69 | <select id="slt-repairadd-group" lay-filter="slt-repairadd-group" |
70 | lay-verify="required" name="manufacturerId"> | 70 | lay-verify="required" name="manufacturerId"> |
@@ -75,13 +75,13 @@ | @@ -75,13 +75,13 @@ | ||
75 | </div> | 75 | </div> |
76 | <div class="layui-form-item"> | 76 | <div class="layui-form-item"> |
77 | <div class="layui-inline inline-half"> | 77 | <div class="layui-inline inline-half"> |
78 | - <label class="layui-form-label">受影响系统</label> | 78 | + <label class="layui-form-label">受影响系统<span style="color: red">*</span></label> |
79 | <div class="layui-input-inline"> | 79 | <div class="layui-input-inline"> |
80 | <input class="layui-input" id="affected" lay-verify="required" name="affected" type="text"> | 80 | <input class="layui-input" id="affected" lay-verify="required" name="affected" type="text"> |
81 | </div> | 81 | </div> |
82 | </div> | 82 | </div> |
83 | <div class="layui-inline inline-half"> | 83 | <div class="layui-inline inline-half"> |
84 | - <label class="layui-form-label">所属ip</label> | 84 | + <label class="layui-form-label">所属ip<span style="color: red">*</span></label> |
85 | <div class="layui-input-inline"> | 85 | <div class="layui-input-inline"> |
86 | <input class="layui-input" id="ip" lay-verify="required" name="ip" type="text"> | 86 | <input class="layui-input" id="ip" lay-verify="required" name="ip" type="text"> |
87 | </div> | 87 | </div> |
@@ -102,31 +102,31 @@ | @@ -102,31 +102,31 @@ | ||
102 | <div class="layui-form-item" id="add-repair-form-atta" style="display: none"> | 102 | <div class="layui-form-item" id="add-repair-form-atta" style="display: none"> |
103 | <label class="layui-form-label">已存附件</label> | 103 | <label class="layui-form-label">已存附件</label> |
104 | <div class="layui-input-inline" | 104 | <div class="layui-input-inline" |
105 | - style="width: 90% !important;max-height: 130px;overflow-y: auto;margin-left: 10px;"> | 105 | + style="width: 85% !important;max-height: 130px;overflow-y: auto;margin-left: 10px;"> |
106 | <div class="tags" id="selecte_content_id"></div> | 106 | <div class="tags" id="selecte_content_id"></div> |
107 | </div> | 107 | </div> |
108 | </div> | 108 | </div> |
109 | 109 | ||
110 | <div class="layui-form-item"> | 110 | <div class="layui-form-item"> |
111 | - <label class="layui-form-label textarea-label">故障现象描述</label> | 111 | + <label class="layui-form-label textarea-label">故障现象描述<span style="color: red">*</span></label> |
112 | <div class="layui-input-block"> | 112 | <div class="layui-input-block"> |
113 | <textarea class="layui-textarea" lay-verify="required" name="phenomenon"></textarea> | 113 | <textarea class="layui-textarea" lay-verify="required" name="phenomenon"></textarea> |
114 | </div> | 114 | </div> |
115 | </div> | 115 | </div> |
116 | <div class="layui-form-item"> | 116 | <div class="layui-form-item"> |
117 | - <label class="layui-form-label textarea-label">解决过程描述</label> | 117 | + <label class="layui-form-label textarea-label">解决过程描述<span style="color: red">*</span></label> |
118 | <div class="layui-input-block"> | 118 | <div class="layui-input-block"> |
119 | <textarea class="layui-textarea" lay-verify="required" name="solveprocess"></textarea> | 119 | <textarea class="layui-textarea" lay-verify="required" name="solveprocess"></textarea> |
120 | </div> | 120 | </div> |
121 | </div> | 121 | </div> |
122 | <div class="layui-form-item"> | 122 | <div class="layui-form-item"> |
123 | - <label class="layui-form-label textarea-label">处理结果</label> | 123 | + <label class="layui-form-label textarea-label">处理结果<span style="color: red">*</span></label> |
124 | <div class="layui-input-block"> | 124 | <div class="layui-input-block"> |
125 | <textarea class="layui-textarea" lay-verify="required" name="result"></textarea> | 125 | <textarea class="layui-textarea" lay-verify="required" name="result"></textarea> |
126 | </div> | 126 | </div> |
127 | </div> | 127 | </div> |
128 | <div class="layui-form-item"> | 128 | <div class="layui-form-item"> |
129 | - <label class="layui-form-label textarea-label">经验总结</label> | 129 | + <label class="layui-form-label textarea-label">经验总结<span style="color: red">*</span></label> |
130 | <div class="layui-input-block"> | 130 | <div class="layui-input-block"> |
131 | <textarea class="layui-textarea" lay-verify="required" name="experience"></textarea> | 131 | <textarea class="layui-textarea" lay-verify="required" name="experience"></textarea> |
132 | </div> | 132 | </div> |
@@ -146,13 +146,13 @@ | @@ -146,13 +146,13 @@ | ||
146 | 146 | ||
147 | <style> | 147 | <style> |
148 | #add-repair-form .layui-form-label { | 148 | #add-repair-form .layui-form-label { |
149 | - width: 120px; | 149 | + width: 146px; |
150 | /* padding: 8px 12px; */ | 150 | /* padding: 8px 12px; */ |
151 | - text-align: left !important; | 151 | + text-align: right !important; |
152 | } | 152 | } |
153 | 153 | ||
154 | #add-repair-form .layui-input-block { | 154 | #add-repair-form .layui-input-block { |
155 | - margin-left: 120px !important; | 155 | + margin-left: 146px !important; |
156 | } | 156 | } |
157 | 157 | ||
158 | .tags { | 158 | .tags { |
@@ -171,7 +171,7 @@ | @@ -171,7 +171,7 @@ | ||
171 | text-shadow: 1px 1px 1px rgba(0, 0, 0, .15); | 171 | text-shadow: 1px 1px 1px rgba(0, 0, 0, .15); |
172 | } | 172 | } |
173 | 173 | ||
174 | - .tags .close { | 174 | + .tagsclose { |
175 | font-weight: bold; | 175 | font-weight: bold; |
176 | line-height: 20px; | 176 | line-height: 20px; |
177 | margin-left: 10px; | 177 | margin-left: 10px; |
@@ -181,4 +181,11 @@ | @@ -181,4 +181,11 @@ | ||
181 | border: 0 none; | 181 | border: 0 none; |
182 | background: transparent none repeat scroll 0 0; | 182 | background: transparent none repeat scroll 0 0; |
183 | } | 183 | } |
184 | + /*.layui-form-pane .layui-form-label {*/ | ||
185 | + /* width: 146px;*/ | ||
186 | + /*}*/ | ||
187 | + | ||
188 | + /*.layui-form-pane .layui-input-block {*/ | ||
189 | + /* margin-left: 146px;*/ | ||
190 | + /*}*/ | ||
184 | </style> | 191 | </style> |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <div class="layui-inline"> | 11 | <div class="layui-inline"> |
12 | <div class="layui-input-inline layui-input-inline--long"> | 12 | <div class="layui-input-inline layui-input-inline--long"> |
13 | <input autocomplete="off" class="layui-input" id="monitor_keyword" | 13 | <input autocomplete="off" class="layui-input" id="monitor_keyword" |
14 | - name="title" placeholder="标题搜索,支持内容模糊匹配" type="text"> | 14 | + name="title" placeholder="标题搜索" type="text"> |
15 | </div> | 15 | </div> |
16 | </div> | 16 | </div> |
17 | <div class="layui-inline"> | 17 | <div class="layui-inline"> |
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | <input hidden id="id" lay-verify="checkReportIsExist" name="id"> | 9 | <input hidden id="id" lay-verify="checkReportIsExist" name="id"> |
10 | <div class="layui-form-item"> | 10 | <div class="layui-form-item"> |
11 | <div class="layui-inline inline-onethird"> | 11 | <div class="layui-inline inline-onethird"> |
12 | - <label class="layui-form-label">报表类型</label> | 12 | + <label class="layui-form-label">报表类型<span style="color: red">*</span></label> |
13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
14 | <select id="slt-docType" lay-filter="slt-docType" | 14 | <select id="slt-docType" lay-filter="slt-docType" |
15 | name="docType"> | 15 | name="docType"> |
@@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
19 | </div> | 19 | </div> |
20 | </div> | 20 | </div> |
21 | <div class="layui-inline inline-onethird"> | 21 | <div class="layui-inline inline-onethird"> |
22 | - <label class="layui-form-label">操作类型</label> | 22 | + <label class="layui-form-label">操作类型<span style="color: red">*</span></label> |
23 | <div class="layui-input-inline"> | 23 | <div class="layui-input-inline"> |
24 | <select id="slt-actionType" lay-filter="slt-actionType" | 24 | <select id="slt-actionType" lay-filter="slt-actionType" |
25 | name="actionType"> | 25 | name="actionType"> |
@@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | <div class="layui-inline inline-onethird"> | 32 | <div class="layui-inline inline-onethird"> |
33 | - <label class="layui-form-label">设备型号</label> | 33 | + <label class="layui-form-label">设备型号<span style="color: red">*</span></label> |
34 | <div class="layui-input-inline"> | 34 | <div class="layui-input-inline"> |
35 | <input class="layui-input" id="deviceModel" lay-verify="required" name="deviceModel" | 35 | <input class="layui-input" id="deviceModel" lay-verify="required" name="deviceModel" |
36 | type="text"> | 36 | type="text"> |
@@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
39 | </div> | 39 | </div> |
40 | <div class="layui-form-item"> | 40 | <div class="layui-form-item"> |
41 | <div class="layui-inline inline-onethird"> | 41 | <div class="layui-inline inline-onethird"> |
42 | - <label class="layui-form-label">机房</label> | 42 | + <label class="layui-form-label">机房<span style="color: red">*</span></label> |
43 | <div class="layui-input-inline"> | 43 | <div class="layui-input-inline"> |
44 | <select id="slt-staffadd-machine" lay-filter="slt-staffadd-machine" | 44 | <select id="slt-staffadd-machine" lay-filter="slt-staffadd-machine" |
45 | lay-verify="required" name="machineRoomId"> | 45 | lay-verify="required" name="machineRoomId"> |
@@ -48,7 +48,7 @@ | @@ -48,7 +48,7 @@ | ||
48 | </div> | 48 | </div> |
49 | </div> | 49 | </div> |
50 | <div class="layui-inline inline-onethird"> | 50 | <div class="layui-inline inline-onethird"> |
51 | - <label class="layui-form-label">选择单位</label> | 51 | + <label class="layui-form-label">选择单位<span style="color: red">*</span></label> |
52 | <div class="layui-input-inline"> | 52 | <div class="layui-input-inline"> |
53 | <select id="slt-staffadd-group" lay-filter="slt-staffadd-group" | 53 | <select id="slt-staffadd-group" lay-filter="slt-staffadd-group" |
54 | lay-verify="required" name="manufacturerId"> | 54 | lay-verify="required" name="manufacturerId"> |
@@ -59,7 +59,7 @@ | @@ -59,7 +59,7 @@ | ||
59 | </div> | 59 | </div> |
60 | </div> | 60 | </div> |
61 | <div class="layui-inline inline-onethird"> | 61 | <div class="layui-inline inline-onethird"> |
62 | - <label class="layui-form-label">申请人</label> | 62 | + <label class="layui-form-label">申请人<span style="color: red">*</span></label> |
63 | <div class="layui-input-inline"> | 63 | <div class="layui-input-inline"> |
64 | <input class="layui-input" id="applyUser" lay-verify="required" name="applyUser" type="text"> | 64 | <input class="layui-input" id="applyUser" lay-verify="required" name="applyUser" type="text"> |
65 | </div> | 65 | </div> |
@@ -67,19 +67,19 @@ | @@ -67,19 +67,19 @@ | ||
67 | </div> | 67 | </div> |
68 | <div class="layui-form-item"> | 68 | <div class="layui-form-item"> |
69 | <div class="layui-inline inline-onethird"> | 69 | <div class="layui-inline inline-onethird"> |
70 | - <label class="layui-form-label">联系方式</label> | 70 | + <label class="layui-form-label">联系方式<span style="color: red">*</span></label> |
71 | <div class="layui-input-inline"> | 71 | <div class="layui-input-inline"> |
72 | <input class="layui-input" id="phone" lay-verify="required|phone" name="phone" type="text"> | 72 | <input class="layui-input" id="phone" lay-verify="required|phone" name="phone" type="text"> |
73 | </div> | 73 | </div> |
74 | </div> | 74 | </div> |
75 | <div class="layui-inline inline-onethird"> | 75 | <div class="layui-inline inline-onethird"> |
76 | - <label class="layui-form-label">进入时间</label> | 76 | + <label class="layui-form-label">进入时间<span style="color: red">*</span></label> |
77 | <div class="layui-input-inline"> | 77 | <div class="layui-input-inline"> |
78 | <input class="layui-input" id="enterTime" lay-verify="required" name="enterTime" type="text"> | 78 | <input class="layui-input" id="enterTime" lay-verify="required" name="enterTime" type="text"> |
79 | </div> | 79 | </div> |
80 | </div> | 80 | </div> |
81 | <div class="layui-inline inline-onethird"> | 81 | <div class="layui-inline inline-onethird"> |
82 | - <label class="layui-form-label">出来时间</label> | 82 | + <label class="layui-form-label">出来时间<span style="color: red">*</span></label> |
83 | <div class="layui-input-inline"> | 83 | <div class="layui-input-inline"> |
84 | <input class="layui-input" id="outTime" lay-verify="required" name="outTime" type="text"> | 84 | <input class="layui-input" id="outTime" lay-verify="required" name="outTime" type="text"> |
85 | </div> | 85 | </div> |
@@ -87,7 +87,7 @@ | @@ -87,7 +87,7 @@ | ||
87 | </div> | 87 | </div> |
88 | <div class="layui-form-item"> | 88 | <div class="layui-form-item"> |
89 | <div class="layui-inline inline-onethird"> | 89 | <div class="layui-inline inline-onethird"> |
90 | - <label class="layui-form-label">现物理位置</label> | 90 | + <label class="layui-form-label">现物理位置<span style="color: red">*</span></label> |
91 | <div class="layui-input-inline"> | 91 | <div class="layui-input-inline"> |
92 | <input class="layui-input" id="localPlace" lay-verify="required" name="localPlace" type="text"> | 92 | <input class="layui-input" id="localPlace" lay-verify="required" name="localPlace" type="text"> |
93 | </div> | 93 | </div> |
@@ -100,7 +100,7 @@ | @@ -100,7 +100,7 @@ | ||
100 | </div> | 100 | </div> |
101 | </div> | 101 | </div> |
102 | <div class="layui-inline inline-onethird"> | 102 | <div class="layui-inline inline-onethird"> |
103 | - <label class="layui-form-label">值班人</label> | 103 | + <label class="layui-form-label">值班人<span style="color: red">*</span></label> |
104 | <div class="layui-input-inline"> | 104 | <div class="layui-input-inline"> |
105 | <input class="layui-input" id="watchkeeper" lay-verify="required" name="watchkeeper" | 105 | <input class="layui-input" id="watchkeeper" lay-verify="required" name="watchkeeper" |
106 | type="text"> | 106 | type="text"> |
@@ -109,21 +109,21 @@ | @@ -109,21 +109,21 @@ | ||
109 | </div> | 109 | </div> |
110 | <div class="layui-form-item"> | 110 | <div class="layui-form-item"> |
111 | <div class="layui-inline inline-onethird"> | 111 | <div class="layui-inline inline-onethird"> |
112 | - <label class="layui-form-label">设备负责人(甲方)</label> | 112 | + <label class="layui-form-label">设备负责人(甲方)<span style="color: red">*</span></label> |
113 | <div class="layui-input-inline"> | 113 | <div class="layui-input-inline"> |
114 | <input class="layui-input" id="machineRoomLeader" lay-verify="required" name="machineRoomLeader" | 114 | <input class="layui-input" id="machineRoomLeader" lay-verify="required" name="machineRoomLeader" |
115 | type="text"> | 115 | type="text"> |
116 | </div> | 116 | </div> |
117 | </div> | 117 | </div> |
118 | <div class="layui-inline inline-onethird"> | 118 | <div class="layui-inline inline-onethird"> |
119 | - <label class="layui-form-label">总集成</label> | 119 | + <label class="layui-form-label">总集成<span style="color: red">*</span></label> |
120 | <div class="layui-input-inline"> | 120 | <div class="layui-input-inline"> |
121 | <input class="layui-input" id="integration" lay-verify="required" name="integration" | 121 | <input class="layui-input" id="integration" lay-verify="required" name="integration" |
122 | type="text"> | 122 | type="text"> |
123 | </div> | 123 | </div> |
124 | </div> | 124 | </div> |
125 | <div class="layui-inline inline-onethird"> | 125 | <div class="layui-inline inline-onethird"> |
126 | - <label class="layui-form-label">运维负责人</label> | 126 | + <label class="layui-form-label">运维负责人<span style="color: red">*</span></label> |
127 | <div class="layui-input-inline"> | 127 | <div class="layui-input-inline"> |
128 | <input class="layui-input" id="operationUser" lay-verify="required" name="operationUser" | 128 | <input class="layui-input" id="operationUser" lay-verify="required" name="operationUser" |
129 | type="text"> | 129 | type="text"> |
@@ -131,7 +131,7 @@ | @@ -131,7 +131,7 @@ | ||
131 | </div> | 131 | </div> |
132 | </div> | 132 | </div> |
133 | <div class="layui-form-item"> | 133 | <div class="layui-form-item"> |
134 | - <label class="layui-form-label textarea-label">进入事由</label> | 134 | + <label class="layui-form-label textarea-label">进入事由<span style="color: red">*</span></label> |
135 | <div class="layui-input-block"> | 135 | <div class="layui-input-block"> |
136 | <textarea class="layui-textarea" id="reason" lay-verify="required" name="reason"></textarea> | 136 | <textarea class="layui-textarea" id="reason" lay-verify="required" name="reason"></textarea> |
137 | </div> | 137 | </div> |
@@ -195,4 +195,12 @@ | @@ -195,4 +195,12 @@ | ||
195 | fn({{ d }}); | 195 | fn({{ d }}); |
196 | }) | 196 | }) |
197 | </script> | 197 | </script> |
198 | +<style> | ||
199 | + .layui-form-pane .layui-form-label { | ||
200 | + width: 146px; | ||
201 | + } | ||
202 | + .layui-form-pane .layui-input-block { | ||
203 | + margin-left: 146px; | ||
204 | + } | ||
205 | +</style> | ||
198 | 206 |
@@ -20,18 +20,18 @@ | @@ -20,18 +20,18 @@ | ||
20 | </div> | 20 | </div> |
21 | <div class="layui-card-body" style="margin-top: 10px;"> | 21 | <div class="layui-card-body" style="margin-top: 10px;"> |
22 | <div style="display: flex"> | 22 | <div style="display: flex"> |
23 | - <form class="layui-form layui-card-header" lay-filter="form-enterStaff-condition" | 23 | + <form class="layui-form layui-card-header" lay-filter="form-enterDevice-condition" |
24 | onsubmit="return false"> | 24 | onsubmit="return false"> |
25 | <div class="layui-form-item"> | 25 | <div class="layui-form-item"> |
26 | <div class="layui-inline"> | 26 | <div class="layui-inline"> |
27 | <div class="layui-input-inline layui-input-inline--long"> | 27 | <div class="layui-input-inline layui-input-inline--long"> |
28 | - <input autocomplete="off" class="layui-input" id="applyUser" | 28 | + <input autocomplete="off" class="layui-input" id="applyUserDevice" |
29 | name="applyUser" placeholder="申请人" type="text"> | 29 | name="applyUser" placeholder="申请人" type="text"> |
30 | </div> | 30 | </div> |
31 | </div> | 31 | </div> |
32 | <div class="layui-inline"> | 32 | <div class="layui-inline"> |
33 | <div class="layui-input-inline"> | 33 | <div class="layui-input-inline"> |
34 | - <select id="slt-staff-group" lay-filter="slt-staff-group" | 34 | + <select id="slt-device-group" lay-filter="slt-device-group" |
35 | lay-search name="manufacturerId"> | 35 | lay-search name="manufacturerId"> |
36 | <option value="">=工作单位=</option> | 36 | <option value="">=工作单位=</option> |
37 | </select> | 37 | </select> |
@@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
9 | <input hidden id="id" lay-verify="checkReportIsExist" name="id"> | 9 | <input hidden id="id" lay-verify="checkReportIsExist" name="id"> |
10 | <div class="layui-form-item"> | 10 | <div class="layui-form-item"> |
11 | <div class="layui-inline inline-onethird"> | 11 | <div class="layui-inline inline-onethird"> |
12 | - <label class="layui-form-label">机房</label> | 12 | + <label class="layui-form-label">机房<span style="color: red">*</span></label> |
13 | <div class="layui-input-inline"> | 13 | <div class="layui-input-inline"> |
14 | <select id="slt-staffadd-machine" lay-filter="slt-staffadd-machine" lay-verify="required" | 14 | <select id="slt-staffadd-machine" lay-filter="slt-staffadd-machine" lay-verify="required" |
15 | name="machineRoomId"> | 15 | name="machineRoomId"> |
@@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
18 | </div> | 18 | </div> |
19 | </div> | 19 | </div> |
20 | <div class="layui-inline inline-onethird"> | 20 | <div class="layui-inline inline-onethird"> |
21 | - <label class="layui-form-label">选择单位</label> | 21 | + <label class="layui-form-label">选择单位<span style="color: red">*</span></label> |
22 | <div class="layui-input-inline"> | 22 | <div class="layui-input-inline"> |
23 | <select id="slt-staffadd-group" lay-filter="slt-staffadd-group" | 23 | <select id="slt-staffadd-group" lay-filter="slt-staffadd-group" |
24 | lay-verify="required" name="manufacturerId"> | 24 | lay-verify="required" name="manufacturerId"> |
@@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
29 | </div> | 29 | </div> |
30 | </div> | 30 | </div> |
31 | <div class="layui-inline inline-onethird"> | 31 | <div class="layui-inline inline-onethird"> |
32 | - <label class="layui-form-label">申请人</label> | 32 | + <label class="layui-form-label">申请人<span style="color: red">*</span></label> |
33 | <div class="layui-input-inline"> | 33 | <div class="layui-input-inline"> |
34 | <input class="layui-input" id="applyUser" lay-verify="required" name="applyUser" type="text"> | 34 | <input class="layui-input" id="applyUser" lay-verify="required" name="applyUser" type="text"> |
35 | </div> | 35 | </div> |
@@ -37,19 +37,19 @@ | @@ -37,19 +37,19 @@ | ||
37 | </div> | 37 | </div> |
38 | <div class="layui-form-item"> | 38 | <div class="layui-form-item"> |
39 | <div class="layui-inline inline-onethird"> | 39 | <div class="layui-inline inline-onethird"> |
40 | - <label class="layui-form-label">联系方式</label> | 40 | + <label class="layui-form-label">联系方式<span style="color: red">*</span></label> |
41 | <div class="layui-input-inline"> | 41 | <div class="layui-input-inline"> |
42 | <input class="layui-input" id="phone" lay-verify="required|phone" name="phone" type="text"> | 42 | <input class="layui-input" id="phone" lay-verify="required|phone" name="phone" type="text"> |
43 | </div> | 43 | </div> |
44 | </div> | 44 | </div> |
45 | <div class="layui-inline inline-onethird"> | 45 | <div class="layui-inline inline-onethird"> |
46 | - <label class="layui-form-label">进入时间</label> | 46 | + <label class="layui-form-label">进入时间<span style="color: red">*</span></label> |
47 | <div class="layui-input-inline"> | 47 | <div class="layui-input-inline"> |
48 | <input class="layui-input" id="enterTime" lay-verify="required" name="enterTime" type="text"> | 48 | <input class="layui-input" id="enterTime" lay-verify="required" name="enterTime" type="text"> |
49 | </div> | 49 | </div> |
50 | </div> | 50 | </div> |
51 | <div class="layui-inline inline-onethird"> | 51 | <div class="layui-inline inline-onethird"> |
52 | - <label class="layui-form-label">出来时间</label> | 52 | + <label class="layui-form-label">出来时间<span style="color: red">*</span></label> |
53 | <div class="layui-input-inline"> | 53 | <div class="layui-input-inline"> |
54 | <input class="layui-input" id="outTime" lay-verify="required" name="outTime" type="text"> | 54 | <input class="layui-input" id="outTime" lay-verify="required" name="outTime" type="text"> |
55 | </div> | 55 | </div> |
@@ -57,21 +57,21 @@ | @@ -57,21 +57,21 @@ | ||
57 | </div> | 57 | </div> |
58 | <div class="layui-form-item"> | 58 | <div class="layui-form-item"> |
59 | <div class="layui-inline inline-onethird"> | 59 | <div class="layui-inline inline-onethird"> |
60 | - <label class="layui-form-label">机房负责人(甲方)</label> | 60 | + <label class="layui-form-label">机房负责人(甲方)<span style="color: red">*</span></label> |
61 | <div class="layui-input-inline"> | 61 | <div class="layui-input-inline"> |
62 | <input class="layui-input" id="machineRoomLeader" lay-verify="required" name="machineRoomLeader" | 62 | <input class="layui-input" id="machineRoomLeader" lay-verify="required" name="machineRoomLeader" |
63 | type="text"> | 63 | type="text"> |
64 | </div> | 64 | </div> |
65 | </div> | 65 | </div> |
66 | <div class="layui-inline inline-onethird"> | 66 | <div class="layui-inline inline-onethird"> |
67 | - <label class="layui-form-label">项目管理员(甲方)</label> | 67 | + <label class="layui-form-label">项目管理员(甲方)<span style="color: red">*</span></label> |
68 | <div class="layui-input-inline"> | 68 | <div class="layui-input-inline"> |
69 | <input class="layui-input" id="projectLeader" lay-verify="required" name="projectLeader" | 69 | <input class="layui-input" id="projectLeader" lay-verify="required" name="projectLeader" |
70 | type="text"> | 70 | type="text"> |
71 | </div> | 71 | </div> |
72 | </div> | 72 | </div> |
73 | <div class="layui-inline inline-onethird"> | 73 | <div class="layui-inline inline-onethird"> |
74 | - <label class="layui-form-label">运维负责人</label> | 74 | + <label class="layui-form-label">运维负责人<span style="color: red">*</span></label> |
75 | <div class="layui-input-inline"> | 75 | <div class="layui-input-inline"> |
76 | <input class="layui-input" id="operationUser" lay-verify="required" name="operationUser" | 76 | <input class="layui-input" id="operationUser" lay-verify="required" name="operationUser" |
77 | type="text"> | 77 | type="text"> |
@@ -80,13 +80,13 @@ | @@ -80,13 +80,13 @@ | ||
80 | </div> | 80 | </div> |
81 | <div class="layui-form-item"> | 81 | <div class="layui-form-item"> |
82 | <div class="layui-inline inline-half"> | 82 | <div class="layui-inline inline-half"> |
83 | - <label class="layui-form-label">携带物品</label> | 83 | + <label class="layui-form-label">携带物品<span style="color: red">*</span></label> |
84 | <div class="layui-input-inline"> | 84 | <div class="layui-input-inline"> |
85 | <input class="layui-input" id="belongings" lay-verify="required" name="belongings" type="text"> | 85 | <input class="layui-input" id="belongings" lay-verify="required" name="belongings" type="text"> |
86 | </div> | 86 | </div> |
87 | </div> | 87 | </div> |
88 | <div class="layui-inline inline-half"> | 88 | <div class="layui-inline inline-half"> |
89 | - <label class="layui-form-label">值班人</label> | 89 | + <label class="layui-form-label">值班人<span style="color: red">*</span></label> |
90 | <div class="layui-input-inline"> | 90 | <div class="layui-input-inline"> |
91 | <input class="layui-input" id="watchkeeper" lay-verify="required" name="watchkeeper" | 91 | <input class="layui-input" id="watchkeeper" lay-verify="required" name="watchkeeper" |
92 | type="text"> | 92 | type="text"> |
@@ -94,7 +94,7 @@ | @@ -94,7 +94,7 @@ | ||
94 | </div> | 94 | </div> |
95 | </div> | 95 | </div> |
96 | <div class="layui-form-item"> | 96 | <div class="layui-form-item"> |
97 | - <label class="layui-form-label textarea-label">进入事由</label> | 97 | + <label class="layui-form-label textarea-label">进入事由<span style="color: red">*</span></label> |
98 | <div class="layui-input-block"> | 98 | <div class="layui-input-block"> |
99 | <textarea class="layui-textarea" id="reason" lay-verify="required" name="reason"></textarea> | 99 | <textarea class="layui-textarea" id="reason" lay-verify="required" name="reason"></textarea> |
100 | </div> | 100 | </div> |
@@ -133,5 +133,13 @@ | @@ -133,5 +133,13 @@ | ||
133 | fn({{ d }}); | 133 | fn({{ d }}); |
134 | }) | 134 | }) |
135 | </script> | 135 | </script> |
136 | +<style> | ||
137 | + .layui-form-pane .layui-form-label { | ||
138 | + width: 146px; | ||
139 | + } | ||
140 | + .layui-form-pane .layui-input-block { | ||
141 | + margin-left: 146px; | ||
142 | + } | ||
143 | +</style> | ||
136 | 144 | ||
137 | 145 |
@@ -610,12 +610,14 @@ export default { | @@ -610,12 +610,14 @@ export default { | ||
610 | proxy.$refs[id].validate((valid) => { | 610 | proxy.$refs[id].validate((valid) => { |
611 | if (valid) { | 611 | if (valid) { |
612 | let params = docForm.value; | 612 | let params = docForm.value; |
613 | - // joke 屏蔽 20221117 如果执行下边屏蔽代码,有错误 | ||
614 | - // if (currentNodeData.value.id == undefined || currentNodeData.value.id == '') { | ||
615 | - // params.pid = '0' | ||
616 | - // } else { | ||
617 | - // params.pid = currentNodeData.value.id; | ||
618 | - // } | 613 | + //joke 修改 20221121 |
614 | + if (params.id == '' || params.id == null){ | ||
615 | + if (currentNodeData.value.id == undefined || currentNodeData.value.id == '') { | ||
616 | + params.pid = '0' | ||
617 | + } else { | ||
618 | + params.pid = currentNodeData.value.id; | ||
619 | + } | ||
620 | + } | ||
619 | if (isUserFolder.value) { | 621 | if (isUserFolder.value) { |
620 | params.id = ""; | 622 | params.id = ""; |
621 | params.docNo = "user"; | 623 | params.docNo = "user"; |
-
Please register or login to post a comment