Authored by zhichao

Merge branch 'master-500-dev' of http://192.168.1.136:82/monitor_v3/hg-monitor-w…

…eb into master-500-dev-lzc
@@ -35,10 +35,32 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie @@ -35,10 +35,32 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie
35 steps: ['1', '2'], 35 steps: ['1', '2'],
36 descriptionHeader: ['基本信息', '升级申请审批信息'], 36 descriptionHeader: ['基本信息', '升级申请审批信息'],
37 showBtn: false, 37 showBtn: false,
  38 + clickAble:true,
38 pageCount: '.pageCont', 39 pageCount: '.pageCont',
39 curStep: 1,//当前显示第几页 40 curStep: 1,//当前显示第几页
40 }) 41 })
41 42
  43 + function loadManufacturer(val) {
  44 + admin.req({
  45 + url: domainName + '/inspection-report/file/document/list?id=63a5c772d6fb6c7dba6bd3d4d337315c&name=&types=&docIds=&checkAuth=true',
  46 + data: {},
  47 + success: function (res) {
  48 + if (res && res.success) {
  49 + let opt = '';
  50 + res.data.forEach(item => {
  51 + let selected = '';
  52 + if(val && item.id === val){
  53 + selected = "selected='selected'"
  54 + }
  55 + opt += `<option value="${item.id}" ${selected}>${item.fileName}</option>`
  56 + })
  57 + $('select[name="appDept"]').append(opt);
  58 + form.render();
  59 + }
  60 + }
  61 + });
  62 + }
  63 +
42 setTimeout(function () { 64 setTimeout(function () {
43 65
44 laydate.render({ 66 laydate.render({
@@ -58,20 +80,6 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie @@ -58,20 +80,6 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie
58 80
59 81
60 admin.req({ 82 admin.req({
61 - url: domainName + '/inspection-report/file/document/list?id=63a5c772d6fb6c7dba6bd3d4d337315c&name=&types=&docIds=&checkAuth=true',  
62 - data: {},  
63 - success: function (res) {  
64 - if (res && res.success) {  
65 - let opt = '';  
66 - res.data.forEach(item => {  
67 - opt += `<option value="${item.id}">${item.fileName}</option>`  
68 - })  
69 - $('select[name="appDept"]').append(opt);  
70 - }  
71 - }  
72 - });  
73 -  
74 - admin.req({  
75 url: domainName + '/api-web/home/business/findAllBusType', 83 url: domainName + '/api-web/home/business/findAllBusType',
76 data: {'type': 'per'}, 84 data: {'type': 'per'},
77 success: function (response) { 85 success: function (response) {
@@ -226,6 +234,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie @@ -226,6 +234,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie
226 busIdSelect.setValue(bean.busIds.split(','), null, true); 234 busIdSelect.setValue(bean.busIds.split(','), null, true);
227 affectedBusIdSelect.setValue(bean.affectedBusIds.split(','), null, true); 235 affectedBusIdSelect.setValue(bean.affectedBusIds.split(','), null, true);
228 userSelect.setValue(bean.acceptUser.split(','), null, true); 236 userSelect.setValue(bean.acceptUser.split(','), null, true);
  237 + loadManufacturer(bean.appDept);
229 form.render(); 238 form.render();
230 } 239 }
231 }) 240 })
@@ -253,18 +262,37 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie @@ -253,18 +262,37 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'vie
253 } 262 }
254 }, 0); 263 }, 0);
255 264
  265 + $(".ystep-container-steps").find("li:nth-child(1)").on('click', function () {
  266 + document.querySelectorAll('#page2 input').forEach((e,i) => {
  267 + $(e).attr("lay-verify","");
  268 + })
  269 + $('#verifyShutdownplanBtn').attr('verify-result',false);
  270 + })
  271 +
  272 + $(".ystep-container-steps").find("li:nth-child(2)").on('click', function () {
  273 + $("#verifyShutdownplanBtn").trigger("click");
  274 + let result = $('#verifyShutdownplanBtn').attr('verify-result');
  275 + if(!result || result !== 'true'){
  276 + $(".ystep-container-steps").find("li:nth-child(1)").trigger("click")
  277 + return false;
  278 + }
  279 + document.querySelectorAll('#page2 input').forEach((e,i) => {
  280 + $(e).attr("lay-verify","required");
  281 + })
  282 +
  283 + loadManufacturer();
  284 +
  285 + })
  286 +
256 form.on('submit(verifyShutdownplanBtn)', function (data) { 287 form.on('submit(verifyShutdownplanBtn)', function (data) {
257 $('#verifyShutdownplanBtn').attr('verify-result',true); 288 $('#verifyShutdownplanBtn').attr('verify-result',true);
258 289
259 - document.querySelectorAll('#page2 input').forEach((e,i) => {  
260 - $(e).attr("lay-verify","required");  
261 - })  
262 290
263 // 获取业务名称 291 // 获取业务名称
264 let arr = busIdSelect.getValue() 292 let arr = busIdSelect.getValue()
265 293
266 // 系统名称:填写停机业务(会存在多个业务系统名称) 294 // 系统名称:填写停机业务(会存在多个业务系统名称)
267 - $('input[name="appName"]').val(arr.map(item => item.name).join(',')); 295 + $('textarea[name="appName"]').val(arr.map(item => item.name).join(','));
268 296
269 297
270 // 申请日期:填写停机计划当天日期 298 // 申请日期:填写停机计划当天日期
@@ -574,11 +574,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -574,11 +574,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
574 $('.layui-layer-btn0').show(); 574 $('.layui-layer-btn0').show();
575 $('.layui-layer-btn1').hide(); 575 $('.layui-layer-btn1').hide();
576 $('.layui-layer-btn2').hide(); 576 $('.layui-layer-btn2').hide();
577 -  
578 - document.querySelectorAll('#page2 input').forEach((e,i) => {  
579 - $(e).attr("lay-verify","");  
580 - })  
581 - $('#verifyShutdownplanBtn').attr('verify-result',false);  
582 return false; 577 return false;
583 }, 578 },
584 btn3: function (index, layero) { 579 btn3: function (index, layero) {
@@ -155,9 +155,11 @@ @@ -155,9 +155,11 @@
155 </div> 155 </div>
156 156
157 <div class="layui-form-item" style="display: flex;"> 157 <div class="layui-form-item" style="display: flex;">
158 - <label class="layui-form-label" style="min-width: 120px!important;">系统名称</label>  
159 - <div class="layui-inline" style="min-width: calc(100% - 120px)!important;">  
160 - <input autocomplete="off" class="layui-input" name="appName" readonly="readonly" placeholder="系统名称" type="text"> 158 + <label class="layui-form-label textarea-label"
  159 + style="min-width: 120px!important;max-width: 120px!important;">系统名称:</label>
  160 + <div class="layui-input-block"
  161 + style="width: calc(100% - 120px)!important;margin-left: 0px!important;">
  162 + <textarea class="layui-textarea" name="appName"></textarea>
161 </div> 163 </div>
162 </div> 164 </div>
163 165
@@ -195,6 +197,14 @@ @@ -195,6 +197,14 @@
195 <input autocomplete="off" class="layui-input" name="appContent" readonly="readonly" placeholder="申请内容" type="text"> 197 <input autocomplete="off" class="layui-input" name="appContent" readonly="readonly" placeholder="申请内容" type="text">
196 </div> 198 </div>
197 </div> 199 </div>
  200 + <div class="layui-form-item" style="display: flex;">
  201 + <label class="layui-form-label textarea-label"
  202 + style="min-width: 120px!important;max-width: 120px!important;">具体内容:</label>
  203 + <div class="layui-input-block"
  204 + style="width: calc(100% - 120px)!important;margin-left: 0px!important;">
  205 + <textarea class="layui-textarea" name="specificContent"></textarea>
  206 + </div>
  207 + </div>
198 </div> 208 </div>
199 </div> 209 </div>
200 </div> 210 </div>