liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zfh 2025-02-26 18:57:16 +08:00
parent 56904146df 73626fa47b
commit 09813ecbc0
3 changed files with 163 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java
View File

@ -146,7 +146,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
childList.add(childMap); childList.add(childMap);
} }
} }
oneList = oneList.stream().distinct().collect(Collectors.toList()); // oneList = oneList.stream().distinct().collect(Collectors.toList());
Map<String, Object> upload = new LinkedHashMap<>(); Map<String, Object> upload = new LinkedHashMap<>();
upload.put("title", "操作"); upload.put("title", "操作");
upload.put("mergeType", "rowspan"); upload.put("mergeType", "rowspan");
@ -360,7 +360,6 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
public AjaxRes saveEvaluateData(EvaluateDataBean o) { public AjaxRes saveEvaluateData(EvaluateDataBean o) {
AjaxRes ar = new AjaxRes(); AjaxRes ar = new AjaxRes();
try { try {
String deptId = UserUtil.getLoginUser().getDeptId(); String deptId = UserUtil.getLoginUser().getDeptId();
String userId = String.valueOf(UserUtil.getLoginUser().getId()); String userId = String.valueOf(UserUtil.getLoginUser().getId());
o.setDeptId(deptId); o.setDeptId(deptId);
@ -1075,7 +1074,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService
private void addSummaryMap(List<Map<String, Object>> twoList, SetTemplateBean setTemplateBean, int childNum, private void addSummaryMap(List<Map<String, Object>> twoList, SetTemplateBean setTemplateBean, int childNum,
int twoNum, String parentId) { int twoNum, String parentId) {
//判断当前二级标题下是否有部门 且二级标题大于1 //判断当前二级标题下是否有部门 且二级标题大于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, addChildMap(twoList, createTemplateBean("小计", setTemplateBean.getParentId(), setTemplateBean.getId()), 2,
2, parentId); 2, parentId);

7
src/main/resources/static/js/evaluate/outsourcerEvaluation/outsourcerEvaluationList.js
View File

@ -238,12 +238,11 @@ function initTable() {
layerOptions.yes = function (index, layero) { layerOptions.yes = function (index, layero) {
//提交子页面时执行 //提交子页面时执行
// 获取弹出层中的form表单元素 // 获取弹出层中的form表单元素
// const formSubmit = layer.getChildFrame("form", index); const formSubmit = layer.getChildFrame("form", index);
// 查找class样式为submitBtn的按钮 // 查找class样式为submitBtn的按钮
// const submited = formSubmit.find("button.subBtn"); const submited = formSubmit.find("button.subBtn");
// 触发点击事件，会对表单进行验证，验证成功则提交表单，失败则返回错误信息 // 触发点击事件，会对表单进行验证，验证成功则提交表单，失败则返回错误信息
// submited.click(); submited.click();
initTable();
}; };
layer.open(layerOptions); layer.open(layerOptions);
} }

105
src/main/resources/static/pages/evaluate/outsourcerEvaluation/evaluationForm.html
View File

@ -20,10 +20,6 @@
display: flex; display: flex;
align-items: center; align-items: center;
} }
.layui-layer-iframe .layui-layer-btn0 {
display: none;
}
</style> </style>
</head> </head>
@ -34,12 +30,12 @@
<table class="layui-table" id="baseTable" lay-filter="baseTable" style="overflow-x: auto;"> <table class="layui-table" id="baseTable" lay-filter="baseTable" style="overflow-x: auto;">
</table> </table>
</div> </div>
<!-- <div class="layui-form-item" style="display: none"> <div class="layui-form-item" style="display: none">
<div class="layui-input-block"> <div class="layui-input-block">
<button type="submit" class="layui-btn subBtn" id="commit" lay-submit lay-filter="formDemo">提交 <button type="submit" class="layui-btn subBtn" id="commit" lay-submit lay-filter="formDemo">提交
</button> </button>
</div> </div>
</div> --> </div>
</form> </form>
<script src="../../../js/publicJs.js"></script> <script src="../../../js/publicJs.js"></script>
<script src="../../../js/common_methon.js"></script> <script src="../../../js/common_methon.js"></script>
@ -62,7 +58,7 @@
tableLoading = layer.load(2, { shade: [0.1, '#fff'] }); tableLoading = layer.load(2, { shade: [0.1, '#fff'] });
initTable(); initTable();
form.on('submit(formDemo)', function (data) { form.on('submit(formDemo)', function (data) {
// getTableData(); getTableData();
return false; return false;
}); });
}); });
@ -223,16 +219,11 @@
// $(this).append(fileDom); // $(this).append(fileDom);
} }
}); if (index === cols.length - 1) {
// let lastRow = tableView.find('tr').last(); // 找到最后一行
}); // let lastCell = lastRow.find('td').last(); // 找到最后一个单元格
var columsName = ['subName'];//需要合并的列名称 ['business_tenant_name','land','contract_begin','contract_end','history_arrears','period']; // let div = lastCell.find('div')
var columsIndex = [1];//需要合并的列索引值 [2,3,5,6,14,15]; let div = $(this).find('div')
merge(res, columsName, columsIndex);
let lastRow = tableView.find('tr').last(); // 找到最后一行
let lastCell = lastRow.find('td').last(); // 找到最后一个单元格
let div = lastCell.find('div')
// 创建自定义 DOM 元素 // 创建自定义 DOM 元素
let customElement = $('<button>', { let customElement = $('<button>', {
@ -246,6 +237,7 @@
// 将自定义元素插入到最后一个单元格 // 将自定义元素插入到最后一个单元格
div.append(customElement); div.append(customElement);
customElement.on('click', function (event) { customElement.on('click', function (event) {
event.stopPropagation() event.stopPropagation()
event.preventDefault() event.preventDefault()
@ -342,30 +334,56 @@
Object.assign(currentRows, formData) Object.assign(currentRows, formData)
currentRows.fileList = fileList 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) for (let key in formData) {
let path = getUrlParam("type") == '0' ? '/outsourcer/saveEvaluateData' : '/outsourcer/updateEvaluateData'; let curTd = tableView.find('tr[data-index=' + rowIndex + ']').find('td[data-field=' + key + ']')
$.ajax({
url: ctxPath + path, if (curTd.length > 0) {
type: 'post', $(curTd).find('.layui-table-cell').text(formData[key]);
data: dataForm, } else {
success: function (res) { console.log('没有找到对应的 td：', key);
if (res.res == '1') { }
}
layer.msg('保存成功'); layer.msg('保存成功');
layer.close(index); // 关闭弹框 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 () { $(document).on('click', '.upload-success i', function () {
var dataIndex = $(this).data('index'); var dataIndex = $(this).data('index');