From e85439da9f2fb1be90509a72e637613a5c0bbc11 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期四, 09 十一月 2023 12:08:18 +0800 Subject: [PATCH] #副PLAN --- src/main/webapp/static/js/plan/plan.js | 646 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 555 insertions(+), 91 deletions(-) diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js index 2dabb60..372ba08 100644 --- a/src/main/webapp/static/js/plan/plan.js +++ b/src/main/webapp/static/js/plan/plan.js @@ -2,18 +2,20 @@ var pageCount = 0; var treeCond; var admin; +var planNeedXmlSelData; layui.config({ base: baseUrl + "/static/layui/lay/modules/" }).extend({ steps: 'steps/steps', cascader: 'cascader/cascader', -}).use(['table','laydate', 'form', 'admin', 'xmSelect', 'steps', 'element', 'cascader', 'tree', 'dropdown'], function(){ +}).use(['table','laydate','layer','upload', 'form', 'admin', 'xmSelect', 'steps', 'element', 'cascader', 'tree', 'dropdown'], function(){ var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var layDate = layui.laydate; var form = layui.form; admin = layui.admin; + var upload = layui.upload; var xmSelect = layui.xmSelect; var steps = layui.steps; var cascader = layui.cascader; @@ -137,19 +139,52 @@ skin: 'line', cols: [[ {type: 'checkbox'} - // ,{field: 'id', align: 'center',title: 'ID'} + ,{field: 'id', align: 'center',title: 'ID'} // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'} - ,{field: 'userId$', align: 'center',title: '涓氬姟鍛�'} - ,{field: 'planType$', align: 'center',title: '涓氬姟绫诲瀷'} - ,{field: 'name', align: 'center',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�'} - ,{field: 'planNeed$', align: 'center',title: '鎵�闇�'} - ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�'} - ,{field: 'orderId$', align: 'center',title: '璺熻釜椤圭洰'} - ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅'} - ,{field: 'uuid', align: 'center',title: '瑙勫垝鍗曚唬鍙�'} - ,{field: 'appleTime$', align: 'center',title: '鐢宠鏃ユ湡'} + ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�',hide: false, width: 100} + ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150,hide: false} + ,{ + field: 'name', + align: 'left', + title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', + width: 220, + style: 'color: #1890ff;cursor:pointer', + event: 'more', + hide: false + } + ,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100,hide: false} + ,{ + field: 'planNeed$', + align: 'left', + title: '鎵�闇�', + templet:function(d){ + return emptyShow(d.planNeed$) + }, + hide: false + } + ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�',hide: true} + ,{field: 'planner$', align: 'left',title: '瑙勫垝鍛�',hide: false, width: 100} + // ,{field: 'nowHeadman$', align: 'left',title: '瑙勫垝缁勯暱',hide: true} + ,{ + field: 'orderId$', + align: 'left', + title: '璺熻釜椤圭洰', + width: 220, + style: 'color: #1890ff;cursor:pointer', + event: 'orderMore',hide: false + } + // ,{ + // field: 'cstmrId$', + // align: 'left', + // title: '鐢叉柟鍗曚綅', + // width: 220, + // style: 'color: #1890ff;cursor:pointer', + // event: 'cstmrMore', + // hide: true + // } + ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: false} // ,{field: 'beItem$', align: 'center',title: '绔嬮」'} - ,{field: 'planner', align: 'center',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}} + // ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}} // ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'} // ,{field: 'form', align: 'center',title: '琛ㄥ崟鍐呭'} // ,{field: 'change$', align: 'center',title: '鏇存敼鏂规'} @@ -158,15 +193,18 @@ // ,{field: 'planBonus', align: 'center',title: '瑙勬牸濂栭噾'} // ,{field: 'planLeaderBonus', align: 'center',title: '瑙勬牸缁勯暱濂栭噾'} // ,{field: 'files', align: 'center',title: '闄勪欢'} - // ,{field: 'settle$', align: 'center',title: '杩涘害'} + ,{field: 'settle$', align: 'center',title: '杩涘害', width: 150} // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'} // ,{field: 'comment', align: 'center',title: '璇勮'} - // ,{field: 'status$', align: 'center',title: '鐘舵��'} - ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} - ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} - ,{field: 'memo', align: 'center',title: '娉ㄩ噴', hide: true} - - ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120} + ,{field: 'status$', align: 'center',title: '鐘舵��'} + ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: true} + ,{field: 'updateBy$', align: 'left',title: '淇敼浜�', width: 100} + ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true} + ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true} + ,{field: 'assistantHostSign', align: 'left',title: '涓诲壇鏍囪', hide: false} + ,{field: 'hostPlanId', align: 'left',title: '涓籌D', hide: false} + ,{field: 'assistantPlanId', align: 'left',title: '鍓疘D', hide: false} + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 340} ]], request: { pageName: 'curr', @@ -190,6 +228,96 @@ pageCurr=curr;pageCount=count; limit(); } + }); + + $("#data-btn-file2").on("click", (e) => { + $("#data-btn-upload").click() + }); + + var _uploadFile = null + //鍝嶅簲涓婁紶 + $("#data-btn-upload").on("change",(evt) => { + var files = evt.target.files; + if(files==null || files.length==0){ + alert("No files wait for import"); + return; + } + + var file = files[0] + + var tr = $(['<tr id="upload-">' + ,'<td id="upload-filename-id-'+ file.lastModified + '">' + file.name +'</td>' + ,'<td>'+ (file.size/1014).toFixed(1) +'kb</td>' + ,'<td id="upload-file-id-' + file.lastModified + '">鍑嗗涓婁紶</td>' + ,'<td>' + ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>' + ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>' + ,'<button id="file-download" class="layui-btn layui-btn-xs demo-reload layui-hide">涓嬭浇</button>' + ,'</td>' + ,'</tr>'].join('')); + + //鍒犻櫎 + tr.find('.demo-delete').on('click', function(){ + tr.remove(); + $("#data-btn-upload").val("") + _uploadFile = null + }); + + $('#data-btn-file3').append(tr) + + _uploadFile = file + }) + + //寮�濮嬩笂浼� + $("#testListAction").on("click", async (e) => { + if (_uploadFile == null) { + return false; + } + + var index = layer.load(1, { + shadeClose: false, + title: '涓婁紶涓�..', + shade: [0.5,'#000'] + }); + + var file = _uploadFile + $("#upload-file-id-" + file.lastModified).html("涓婁紶涓�") + + putObject(file).then((result) => { + var filename = result.name + layer.msg('涓婁紶鎴愬姛', {icon: 1}); + $("#upload-file-id-" + file.lastModified).html("涓婁紶鎴愬姛") + $("#upload-filename-id-" + file.lastModified).html(filename) + + $.ajax({ + url: baseUrl+"/plan/insert/file/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + 'planId': $('.layui-layer-title').text(), + 'filename': filename, + 'filesize': file.size + }, + method: 'POST', + success: function (res) { + if (res.code === 200){ + layer.close(index) + console.log(res) + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg) + } + } + }); + }).catch((e) => { + console.log(e) + layer.msg('涓婁紶澶辫触', {icon: 2}); + $("#upload-file-id-" + file.lastModified).html("涓婁紶澶辫触") + }) + + //娓呯┖file + $("#data-btn-upload").val("") + _uploadFile = null }); // 娣诲姞 @@ -224,33 +352,68 @@ let planTypeId = data.field.planType; let loadIndex0 = layer.load(2); $.ajax({ - url: baseUrl + "/planType/" + planTypeId + "/auth", + url: baseUrl + "/planType/" + planTypeId + "/plan/auth", headers: {'token': localStorage.getItem('token')}, method: 'GET', success: function (res0) { - let planType = res0.data; + let planType = res0.data.planType; + console.log(planType.html) if (res0.code === 200) { admin.open({ type: 1, - area: '1500px', + area: ["95%", "90%"], + offset: 'auto', title: '娣诲姞鍞墠瑙勫垝鐢宠鍗�' + ' - ' + planType.name, content: $('#editDialog').html(), success: function (layero0, dIndex0) { + $('#customizeBox').html(planType.html) + layer.close(loadIndex0); let orderSel = loadOrderSel(); let cstmrSel = loadCstmrSel(); + let userSel = loadUserSel(); + userSel.setValue([ + {name: res0.data.nickName, value: Number(res0.data.userId)}, + ]) let planNeedSel = loadPlanNeedSel(); form.val('detail', { - planTypeName: planType.name + planTypeName: planType.name, + userXmlSelPhone: res0.data.mobile }); layDateRender(); form.on('submit(editSubmit)', function (data) { + console.log(data) + data.field.planType = planType.id; data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null; data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null; - data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null; + data.field.userId = userSel.getValue()[0] ? userSel.getValue()[0].value : null; + // data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null; + var planNeedValue= planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null; + for (var i=1;i<planNeedSel.getValue().length;i++){ + planNeedValue =planNeedSel.getValue()[i] ? planNeedValue+"-"+planNeedSel.getValue()[i].value : planNeedValue; + } + data.field.planNeed = planNeedValue; + + delete data.field.select;delete data.field.planTypeName; + + if (!data.field.orderId) { + layer.msg("璺熻釜椤圭洰涓嶈兘涓虹┖", {icon: 2}); + top.requireTip($('#orderXmlSel')); + return false; + } + if (!data.field.cstmrId) { + layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2}); + top.requireTip($('#cstmrXmlSel')); + return false; + } + if (!data.field.userId) { + layer.msg("涓氬姟鍛樹笉鑳戒负绌�", {icon: 2}); + top.requireTip($('#userXmlSel')); + return false; + } var loadIndex = layer.load(2); $.ajax({ - url: baseUrl+"/plan/"+(mData?'update':'add')+"/auth", + url: baseUrl+"/plan/add/auth", headers: {'token': localStorage.getItem('token')}, data: data.field, method: 'POST', @@ -359,50 +522,328 @@ } }) break; + case 'approval': + layer.confirm('瀹℃壒閫氳繃锛�', { + skin: 'layui-layer-admin', + shade: .1, + offset: '200px', + title: data.name + }, function (i) { + layer.close(i); + // 鎸囧畾瑙勫垝鍛� + if (data.settle === 1) { + admin.open({ + type: 1, + area: '300px', + title: '閫夋嫨瑙勫垝鍛�', + content: $('#plannerListDialog').html(), + success: function (layero, dIndex) { + let plannerSel = xmSelect.render({ + el: '#plannerXmlSel', + autoRow: true, + filterable: true, + remoteSearch: true, + clickClose: true, + radio: true, + remoteMethod: function (val, cb, show) { + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/plan/planner/list/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + planId: data.id + }, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200) { + cb(res.data) + } else { + layer.close(dIndex); + layer.msg(res.msg, {icon: 2}); + } + } + }) + } + }); + + form.on('submit(editSubmit)', function () { + let plannerId = plannerSel.getValue()[0] ? plannerSel.getValue()[0].value : null; + if (!plannerId) { + layer.msg("璇烽�夋嫨瑙勫垝鍛�", {icon: 2}); + top.requireTip($('#plannerXmlSel')); + return false; + } + approval(data.id, plannerId, dIndex); + }); + + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + } + }) + } else { + approval(data.id); + } + }); + break; + case 'approvalEnd': + layer.confirm('瀹℃壒鎷掔粷锛�', { + skin: 'layui-layer-admin', + shade: .1, + offset: '200px', + title: data.name + }, function (i) { + layer.close(i); + approvalEnd(data.id); + }); + break; + case 'assistantPlan': + assistantPlan(data); + break; case 'edit': showEditModel(data); break; case "del": del([data.id]); break; + case "uploadLink": + var planIdSign = data.id; + if (data.assistantHostSign==1){ + planIdSign = data.hostPlanId; + } + // 鎵撳紑寮圭獥 + // 鏋勫缓甯﹀弬鏁扮殑鍐呭 + layer.open({ + type: 1, + title: '涓婁紶鏂囦欢-'+planIdSign, + content: $('#myModal') + }); + // 鑾峰彇璺緞涓嬬殑鏂囦欢鍒楄〃锛屼娇鐢� jQuery 鐨� ajax 鏂规硶 + $.ajax({ + url: '/plan/view/file/auth', + data:{ + planId:planIdSign + }, + success: function(response) { + if (response.code==200){ + var targetTable = document.getElementById("data-btn-file3"); + // var targetTable1 = document.getElementById("layui-layer2"); + // // 鑾峰彇鏂囨湰鍐呭 + // var text = targetTable1.textContent.trim(); + // console.log(text); // 杈撳嚭 '涓婁紶鏂囦欢-20' + targetTable.innerHTML = ''; + // 灏嗚幏鍙栧埌鐨勬枃浠跺垪琛ㄦ坊鍔犲埌鏂囦欢闃熷垪涓繘琛屾樉绀� + response.data.forEach(function(file,index) { + // 鍒涘缓tr鍏冪礌 + var tr = document.createElement("tr"); + tr.id = "upload-"+index; + tr.innerHTML = '<td>' + file.name + '</td>' + + '<td>' + (file.size / 1024).toFixed(1) + 'kb</td>' + // + '<td><div class="layui-progress" lay-filter="progress-demo-' + index ,100 + '%'+ '"><div class="layui-progress-bar" lay-percent=""></div></div></td>' + + '<td>'+'宸插畬鎴�'+'</td>' + + '<td>' + + '<button class="layui-btn layui-btn-xs demo-reload layui-hide">閲嶄紶</button>' + // + '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">鍒犻櫎</button>' + + '<a href="' + file.path + '" download class="layui-btn layui-btn-xs layui-btn-primary">涓嬭浇</a>' + + '</td>'; + // 灏唗r鍏冪礌娣诲姞鍒扮洰鏍噒able涓� + targetTable.appendChild(tr); + }); + }else { + console.log('Failed to get file list error.'); + } + }, + error: function() { + console.log('Failed to get file list.'); + } + }); + break; } }); + // 鐐瑰嚮涓嬭浇鎸夐挳鏃惰Е鍙戞枃浠朵笅杞� + $('#data-btn-file3').on('click', 'a', function() { + var downloadUrl = $(this).attr('href'); + let url = getObjectUrl(downloadUrl) + layer.msg("鍑嗗涓嬭浇涓�", {icon: 1}); + // location.href = url + window.open(url) + return false; // 闃绘榛樿鐨勯摼鎺ヨ烦杞涓� + }); + + function approval(planId, plannerId, dIdx) { + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/plan/approval/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + planId: planId, + plannerId: plannerId + }, + method: 'POST', + success: function (res) { + if (dIdx) { + layer.close(dIdx); + } + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + } + + function approvalEnd(planId, plannerId, dIdx) { + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/plan/approvalEnd/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + planId: planId, + plannerId: plannerId + }, + method: 'POST', + success: function (res) { + if (dIdx) { + layer.close(dIdx); + } + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + } + /* 寮圭獥 - 鏂板銆佷慨鏀� */ function showEditModel(mData) { - admin.open({ - type: 1, - area: '600px', - title: (mData ? '淇敼' : '娣诲姞') + '鍞墠瑙勫垝鐢宠鍗�', - content: $('#editDialog').html(), - success: function (layero, dIndex) { - layDateRender(mData); - form.val('detail', mData); - form.on('submit(editSubmit)', function (data) { - var loadIndex = layer.load(2); - $.ajax({ - url: baseUrl+"/plan/"+(mData?'update':'add')+"/auth", - headers: {'token': localStorage.getItem('token')}, - data: data.field, - method: 'POST', - success: function (res) { - layer.close(loadIndex); - if (res.code === 200){ - layer.close(dIndex); - layer.msg(res.msg, {icon: 1}); - tableReload(); - } else if (res.code === 403){ - top.location.href = baseUrl+"/"; - }else { - layer.msg(res.msg, {icon: 2}); + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl + "/plan/" + mData.id + "/auth", + headers: {'token': localStorage.getItem('token')}, + method: 'GET', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + let plan = res.data; + admin.open({ + type: 1, + area: ["95%", "90%"], + offset: 'auto', + title: '缂栬緫鍞墠瑙勫垝鐢宠鍗� - ' + plan.planType$, + content: $('#editDialog').html(), + success: function (layero, dIndex) { + $('#customizeBox').html(plan.formHtml); + let orderSel = loadOrderSel(); + let cstmrSel = loadCstmrSel(); + let userSel = loadUserSel(); + let planNeedSel = loadPlanNeedSel(); + if (plan.orderId) { orderSel.setValue([{name: plan.orderId$, value: plan.orderId}]); } + if (plan.cstmrId) { cstmrSel.setValue([{name: plan.cstmrId$, value: plan.cstmrId}]); } + if (plan.userId) { userSel.setValue([{name: plan.userId$, value: plan.userId}]); } + let split = plan.planNeed.split("-"); + if (plan.planNeed) { + var data = [] + split.forEach((item,idx) => { + data.push(parseInt(item)) + }) + planNeedXmlSelData = data } + layDateRender(plan); + plan['planTypeName'] = plan.planType$; + form.val('detail', plan); + form.on('submit(editSubmit)', function (data) { + data.field.orderId = orderSel.getValue()[0] ? orderSel.getValue()[0].value : null; + data.field.cstmrId = cstmrSel.getValue()[0] ? cstmrSel.getValue()[0].value : null; + data.field.userId = userSel.getValue()[0] ? userSel.getValue()[0].value : null; + // data.field.planNeed = planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null; + var planNeedValue= planNeedSel.getValue()[0] ? planNeedSel.getValue()[0].value : null; + for (var i=1;i<planNeedSel.getValue().length;i++){ + planNeedValue =planNeedSel.getValue()[i] ? planNeedValue+"-"+planNeedSel.getValue()[i].value : planNeedValue; + } + data.field.planNeed = planNeedValue; + delete data.field.select;delete data.field.planTypeName; + + if (!data.field.orderId) { + layer.msg("璺熻釜椤圭洰涓嶈兘涓虹┖", {icon: 2}); + top.requireTip($('#orderXmlSel')); + return false; + } + if (!data.field.cstmrId) { + layer.msg("瀹㈡埛鍚嶇О涓嶈兘涓虹┖", {icon: 2}); + top.requireTip($('#cstmrXmlSel')); + return false; + } + let loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/plan/update/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.close(dIndex); + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); } - }) - return false; - }); - $(layero).children('.layui-layer-content').css('overflow', 'visible'); - layui.form.render('select'); + }); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } } + }); + } + + /* 鏂板缓 */ + function assistantPlan(data) { + layer.confirm('纭畾瑕佹柊寤鸿揣鏋惰鍒掑鎵瑰悧锛�', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/plan/assistantPlan/add/auth", + headers: {'token': localStorage.getItem('token')}, + data: { + hostPlanId: data.id + }, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) }); } @@ -437,13 +878,7 @@ // 鎼滅储 form.on('submit(search)', function (data) { pageCurr = 1; - tableReload(); - }); - - // 閲嶇疆 - form.on('submit(reset)', function (data) { - pageCurr = 1; - clearFormVal($('#search-box')); + pageCount = 0; tableReload(); }); @@ -458,22 +893,22 @@ layDate.render({ elem: '#appleTime\\$', type: 'date', - value: data!==undefined?data['appleTime\\$']:null + value: data!==undefined?data['appleTime$']:null }); layDate.render({ elem: '#finishTime\\$', - type: 'datet', - value: data!==undefined?data['finishTime\\$']:null + type: 'date', + value: data!==undefined?data['finishTime$']:null }); layDate.render({ elem: '#createTime\\$', type: 'datetime', - value: data!==undefined?data['createTime\\$']:null + value: data!==undefined?data['createTime$']:null }); layDate.render({ elem: '#updateTime\\$', type: 'datetime', - value: data!==undefined?data['updateTime\\$']:null + value: data!==undefined?data['updateTime$']:null }); }, 300); @@ -486,6 +921,7 @@ autoRow: true, filterable: true, remoteSearch: true, + clickClose: true, radio: true, remoteMethod: function (val, cb, show) { $.ajax({ @@ -514,6 +950,7 @@ autoRow: true, filterable: true, remoteSearch: true, + clickClose: true, radio: true, remoteMethod: function (val, cb, show) { $.ajax({ @@ -527,11 +964,30 @@ if (res.code === 200) { cb(res.data) } else { - cb([]); + cb([]);Query/auth layer.msg(res.msg, {icon: 2}); } } }); + }, + on: function (data){ + if (data.change.length > 0) { + let orderId = data.change[0].value; + $.ajax({ + url: baseUrl + "/order/" + orderId + "/auth", + headers: {'token': localStorage.getItem('token')}, + data: {}, + method: 'GET', + success: function (res) { + if (res.code === 200) { + let cstmrSel = loadCstmrSel(); + cstmrSel.setValue([{name: res.data.cstmrId$, value: res.data.cstmrId}]); + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }); + } } }); } @@ -542,6 +998,7 @@ autoRow: true, filterable: true, remoteSearch: true, + clickClose: true, radio: true, remoteMethod: function (val, cb, show) { $.ajax({ @@ -553,7 +1010,8 @@ method: 'POST', success: function (res) { if (res.code === 200) { - cb(res.data) + // cb(res.data) + cb([]); } else { cb([]); layer.msg(res.msg, {icon: 2}); @@ -565,31 +1023,33 @@ } window.loadPlanNeedSel = function () { - return xmSelect.render({ + var planNeedXmlSel = xmSelect.render({ el: '#planNeedXmlSel', autoRow: true, - filterable: true, - remoteSearch: true, - radio: true, - remoteMethod: function (val, cb, show) { - $.ajax({ - url: baseUrl + "/planNeed/all/get/kv", - headers: {'token': localStorage.getItem('token')}, - data: { - condition: val - }, - method: 'POST', - success: function (res) { - if (res.code === 200) { - cb(res.data) - } else { - cb([]); - layer.msg(res.msg, {icon: 2}); - } - } - }); + data: [] + }); + + $.ajax({ + url: baseUrl + "/planNeed/all/get/kv", + headers: {'token': localStorage.getItem('token')}, + data: { + condition: "" + }, + method: 'POST', + success: function (res) { + if (res.code === 200) { + planNeedXmlSel.update({ + initValue: planNeedXmlSelData, + data: res.data + }) + } else { + cb([]); + layer.msg(res.msg, {icon: 2}); + } } }); + + return planNeedXmlSel; } window.loadUserSel = function () { @@ -598,6 +1058,7 @@ autoRow: true, filterable: true, remoteSearch: true, + clickClose: true, radio: true, remoteMethod: function (val, cb, show) { $.ajax({ @@ -623,7 +1084,7 @@ }); -// 鍏抽棴鍔ㄤ綔 +// 鐐瑰嚮浜嬩欢 $(document).on('click','#data-detail-close', function () { parent.layer.closeAll(); }); @@ -634,6 +1095,9 @@ $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; }); + if (treeCond) { + searchData[treeCond.key] = treeCond.val; + } tableIns.reload({ where: searchData, page: {curr: pageCurr} -- Gitblit v1.9.1