diff --git a/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js b/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js index 9563a7c..82a2318 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js +++ b/src/main/resources/static/js/basic/lineManagement/child/lineFormTemp.js @@ -171,6 +171,16 @@ function saveData2() { $('#formSubmit').trigger('click') } +// 处理空字段,转换为null +function handleEmptyFields(data) { + for (let key in data) { + if (data[key] === '' || data[key] === undefined) { + data[key] = null; + } + } + return data; +} + // 保存数据 function saveData(data) { let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0}); @@ -180,15 +190,20 @@ function saveData(data) { url = dataUrl + "/tbProject/updateTbProject"; } params.departId = params.orgId_select_nodeId; - console.log("线路工程管理的新增修改", params) + + // 处理空字段 + params = handleEmptyFields(params); + + console.log("线路工程管理的新增修改", params); params = { encryptedData: encryptCBC(JSON.stringify(params)) } + ajaxRequest(url, "POST", params, true, function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); }, function (result) { - layer.close(loadingMsg); // 关闭提示层 + layer.close(loadingMsg); if (result.code === 200) { closePage(1); parent.layer.msg(result.msg, {icon: 1}); @@ -198,7 +213,7 @@ function saveData(data) { $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); } }, function (xhr) { - layer.close(loadingMsg); // 关闭提示层 + layer.close(loadingMsg); $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); error(xhr) diff --git a/src/main/resources/static/js/basic/lineManagement/lineList.js b/src/main/resources/static/js/basic/lineManagement/lineList.js index 7deacab..98c0ba3 100644 --- a/src/main/resources/static/js/basic/lineManagement/lineList.js +++ b/src/main/resources/static/js/basic/lineManagement/lineList.js @@ -77,7 +77,13 @@ function initTable(dataList, limit, page) { {field: "lineLength", title: "线路长度(km)",width: 200, unresize: true, align: "center"}, {field: "", title: "计划起止时间",width: 180, unresize: true, align: "center", templet: function (d) { - let html = d.planStartTime + "~" + d.planEndTime; + let html=""; + if(d.planStartTime){ + html = d.planStartTime; + } + if(d.planEndTime){ + html += "~" + d.planEndTime; + } return html; } },