Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
09813ecbc0
|
|
@ -146,7 +146,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
|||
childList.add(childMap);
|
||||
}
|
||||
}
|
||||
oneList = oneList.stream().distinct().collect(Collectors.toList());
|
||||
// oneList = oneList.stream().distinct().collect(Collectors.toList());
|
||||
Map<String, Object> upload = new LinkedHashMap<>();
|
||||
upload.put("title", "操作");
|
||||
upload.put("mergeType", "rowspan");
|
||||
|
|
@ -360,7 +360,6 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
|||
public AjaxRes saveEvaluateData(EvaluateDataBean o) {
|
||||
AjaxRes ar = new AjaxRes();
|
||||
try {
|
||||
|
||||
String deptId = UserUtil.getLoginUser().getDeptId();
|
||||
String userId = String.valueOf(UserUtil.getLoginUser().getId());
|
||||
o.setDeptId(deptId);
|
||||
|
|
@ -1075,7 +1074,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
|
|||
private void addSummaryMap(List<Map<String, Object>> twoList, SetTemplateBean setTemplateBean, int childNum,
|
||||
int twoNum, String parentId) {
|
||||
//判断当前二级标题下是否有部门 且二级标题大于1
|
||||
if (childNum > 1 && setTemplateBean.getResponsibleDepartment().split(",").length > 1) {
|
||||
if (childNum > 1 && setTemplateBean.getResponsibleDepartment().split(",").length > 0) {
|
||||
//添加小计
|
||||
addChildMap(twoList, createTemplateBean("小计", setTemplateBean.getParentId(), setTemplateBean.getId()), 2,
|
||||
2, parentId);
|
||||
|
|
|
|||
|
|
@ -238,12 +238,11 @@ function initTable() {
|
|||
layerOptions.yes = function (index, layero) {
|
||||
//提交子页面时执行
|
||||
// 获取弹出层中的form表单元素
|
||||
// const formSubmit = layer.getChildFrame("form", index);
|
||||
const formSubmit = layer.getChildFrame("form", index);
|
||||
// 查找class样式为submitBtn的按钮
|
||||
// const submited = formSubmit.find("button.subBtn");
|
||||
const submited = formSubmit.find("button.subBtn");
|
||||
// 触发点击事件，会对表单进行验证，验证成功则提交表单，失败则返回错误信息
|
||||
// submited.click();
|
||||
initTable();
|
||||
submited.click();
|
||||
};
|
||||
layer.open(layerOptions);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@
|
|||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.layui-layer-iframe .layui-layer-btn0 {
|
||||
display: none;
|
||||
}
|
||||
</style>
|
||||
|
||||
</head>
|
||||
|
|
@ -34,12 +30,12 @@
|
|||
<table class="layui-table" id="baseTable" lay-filter="baseTable" style="overflow-x: auto;">
|
||||
</table>
|
||||
</div>
|
||||
<!-- <div class="layui-form-item" style="display: none">
|
||||
<div class="layui-form-item" style="display: none">
|
||||
<div class="layui-input-block">
|
||||
<button type="submit" class="layui-btn subBtn" id="commit" lay-submit lay-filter="formDemo">提交
|
||||
</button>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</form>
|
||||
<script src="../../../js/publicJs.js"></script>
|
||||
<script src="../../../js/common_methon.js"></script>
|
||||
|
|
@ -62,7 +58,7 @@
|
|||
tableLoading = layer.load(2, { shade: [0.1, '#fff'] });
|
||||
initTable();
|
||||
form.on('submit(formDemo)', function (data) {
|
||||
// getTableData();
|
||||
getTableData();
|
||||
return false;
|
||||
});
|
||||
});
|
||||
|
|
@ -223,16 +219,11 @@
|
|||
// $(this).append(fileDom);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
var columsName = ['subName'];//需要合并的列名称 ['business_tenant_name','land','contract_begin','contract_end','history_arrears','period'];
|
||||
var columsIndex = [1];//需要合并的列索引值 [2,3,5,6,14,15];
|
||||
merge(res, columsName, columsIndex);
|
||||
|
||||
let lastRow = tableView.find('tr').last(); // 找到最后一行
|
||||
let lastCell = lastRow.find('td').last(); // 找到最后一个单元格
|
||||
let div = lastCell.find('div')
|
||||
if (index === cols.length - 1) {
|
||||
// let lastRow = tableView.find('tr').last(); // 找到最后一行
|
||||
// let lastCell = lastRow.find('td').last(); // 找到最后一个单元格
|
||||
// let div = lastCell.find('div')
|
||||
let div = $(this).find('div')
|
||||
|
||||
// 创建自定义 DOM 元素
|
||||
let customElement = $('<button>', {
|
||||
|
|
@ -246,6 +237,7 @@
|
|||
|
||||
// 将自定义元素插入到最后一个单元格
|
||||
div.append(customElement);
|
||||
|
||||
customElement.on('click', function (event) {
|
||||
event.stopPropagation()
|
||||
event.preventDefault()
|
||||
|
|
@ -342,30 +334,56 @@
|
|||
Object.assign(currentRows, formData)
|
||||
|
||||
currentRows.fileList = fileList
|
||||
let dataForm = {
|
||||
templateId: getUrlParam('templateId'),
|
||||
evaluateId: getUrlParam('id'),
|
||||
id: getUrlParam('detailsId'),
|
||||
jsonData: JSON.stringify([currentRows]),
|
||||
titleFiled: fields.join(','),
|
||||
}
|
||||
|
||||
console.log('提交时的formDat参数', dataForm)
|
||||
let path = getUrlParam("type") == '0' ? '/outsourcer/saveEvaluateData' : '/outsourcer/updateEvaluateData';
|
||||
$.ajax({
|
||||
url: ctxPath + path,
|
||||
type: 'post',
|
||||
data: dataForm,
|
||||
success: function (res) {
|
||||
if (res.res == '1') {
|
||||
for (let key in formData) {
|
||||
let curTd = tableView.find('tr[data-index=' + rowIndex + ']').find('td[data-field=' + key + ']')
|
||||
|
||||
if (curTd.length > 0) {
|
||||
$(curTd).find('.layui-table-cell').text(formData[key]);
|
||||
} else {
|
||||
console.log('没有找到对应的 td：', key);
|
||||
}
|
||||
}
|
||||
layer.msg('保存成功');
|
||||
layer.close(index); // 关闭弹框
|
||||
initTable()
|
||||
} else {
|
||||
layer.msg(res.resMsg);
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// 更新当前行的表格数据
|
||||
// let colsNew = tableView.find('tr[data-index=' + rowIndex + ']').find('td');
|
||||
|
||||
// 遍历所有列，更新相应的单元格
|
||||
// colsNew.each(function (index, td) {
|
||||
// // 获取字段名，和表格列的字段对应
|
||||
// let fieldName = dialogLabelInfo[index]?.field;
|
||||
|
||||
// // 如果该列对应的字段存在，则更新该单元格的值
|
||||
// if (fieldName && currentRows[fieldName] !== undefined) {
|
||||
// $(td).text(formData[fieldName]);
|
||||
// }
|
||||
// })
|
||||
// let dataForm = {
|
||||
// templateId: getUrlParam('templateId'),
|
||||
// evaluateId: getUrlParam('id'),
|
||||
// id: getUrlParam('detailsId'),
|
||||
// jsonData: JSON.stringify([currentRows]),
|
||||
// titleFiled: fields.join(','),
|
||||
// }
|
||||
|
||||
// console.log('提交时的formDat参数', dataForm)
|
||||
// let path = getUrlParam("type") == '0' ? '/outsourcer/saveEvaluateData' : '/outsourcer/updateEvaluateData';
|
||||
// $.ajax({
|
||||
// url: ctxPath + path,
|
||||
// type: 'post',
|
||||
// data: dataForm,
|
||||
// success: function (res) {
|
||||
// if (res.res == '1') {
|
||||
// layer.msg('保存成功');
|
||||
// layer.close(index); // 关闭弹框
|
||||
// initTable()
|
||||
// } else {
|
||||
// layer.msg(res.resMsg);
|
||||
// }
|
||||
// }
|
||||
// })
|
||||
|
||||
|
||||
// 这里可以执行你需要的操作
|
||||
|
|
@ -377,6 +395,17 @@
|
|||
}
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
});
|
||||
var columsName = ['subName'];//需要合并的列名称 ['business_tenant_name','land','contract_begin','contract_end','history_arrears','period'];
|
||||
var columsIndex = [1];//需要合并的列索引值 [2,3,5,6,14,15];
|
||||
merge(res, columsName, columsIndex);
|
||||
|
||||
|
||||
|
||||
|
||||
$(document).on('click', '.upload-success i', function () {
|
||||
var dataIndex = $(this).data('index');
|
||||
|
|
|
|||
Loading…
Reference in New Issue