This commit is contained in:
BianLzhaoMin 2025-02-27 09:51:24 +08:00
parent 8f8e1c78d0
commit 27d2e94533
1 changed files with 33 additions and 21 deletions

View File

@ -51,6 +51,7 @@
// 定义一个列表的数据源 作为提交时参数 // 定义一个列表的数据源 作为提交时参数
let tableRowList = [] let tableRowList = []
let tableFieldList = []
$(function () { $(function () {
layui.use(['layer', 'laydate', 'table', 'form'], function () { layui.use(['layer', 'laydate', 'table', 'form'], function () {
layer = layui.layer; layer = layui.layer;
@ -133,6 +134,7 @@
// 定义弹框内需要的label // 定义弹框内需要的label
const dialogLabelList = headerRows[1] const dialogLabelList = headerRows[1]
const dialogLabelInfo = headerRows[2] const dialogLabelInfo = headerRows[2]
tableFieldList = dialogLabelInfo
// Clear existing headers // Clear existing headers
const thead = document.querySelector('#baseTable thead'); const thead = document.querySelector('#baseTable thead');
@ -295,9 +297,7 @@
console.log('文件上传成功'); console.log('文件上传成功');
console.log(res); console.log(res);
var dataId = $(this.elem).data('id'); var dataId = $(this.elem).data('id');
var dataIndex = $(this.elem).data('index');
tableRowList[rowIndex][`${dataId}-file`] = { tableRowList[rowIndex][`${dataId}-file`] = {
fileName: res.message, fileName: res.message,
filePath: res.obj, filePath: res.obj,
@ -343,7 +343,7 @@
const currentRows = tableRowList[rowIndex] const currentRows = tableRowList[rowIndex]
Object.assign(currentRows, formData) Object.assign(currentRows, formData)
currentRows.fileList = fileList // currentRows.fileList = fileList
for (let key in formData) { for (let key in formData) {
let curTd = tableView.find('tr[data-index=' + rowIndex + ']').find('td[data-field=' + key + ']') let curTd = tableView.find('tr[data-index=' + rowIndex + ']').find('td[data-field=' + key + ']')
@ -522,13 +522,9 @@
function getTableData() { function getTableData() {
console.log('tableRowList上传了', tableRowList)
if (true) return for (var i = 0; i < tableRowList.length; i++) {
//获取表格填写的数据 var item = tableRowList[i];
var tableData = table.cache.baseTable;
//校验所有单元格是否填写
for (var i = 0; i < tableData.length; i++) {
var item = tableData[i];
for (var key in item) { for (var key in item) {
if (key.indexOf("-") !== -1) { if (key.indexOf("-") !== -1) {
if (item[key] === '' || item[key] === null) { if (item[key] === '' || item[key] === null) {
@ -538,18 +534,34 @@
} }
} }
} }
let filed = [];
//定义一个map
let obj = tableData[0]; // //获取表格填写的数据
for (let key in obj) { // var tableData = table.cache.baseTable;
if (key.indexOf("-") !== -1) { // //校验所有单元格是否填写
filed.push(key); // for (var i = 0; i < tableData.length; i++) {
} // var item = tableData[i];
} // for (var key in item) {
// if (key.indexOf("-") !== -1) {
// if (item[key] === '' || item[key] === null) {
// layer.msg('请对所有指标评价完成,再点击提交!');
// return;
// }
// }
// }
// }
// let filed = [];
// //定义一个map
// let obj = tableData[0];
// for (let key in obj) {
// if (key.indexOf("-") !== -1) {
// filed.push(key);
// }
// }
if (getUrlParam("type") == '2') { if (getUrlParam("type") == '2') {
//对tableData进行处理 appraiser = 当前人 //对tableData进行处理 appraiser = 当前人
for (let i = 0; i < tableData.length; i++) { for (let i = 0; i < tableData.length; i++) {
tableData[i].appraiser = JSON.parse(localStorage.getItem('loginUser')).nickname; tableRowList[i].appraiser = JSON.parse(localStorage.getItem('loginUser')).nickname;
} }
} }
//TODO 校验数据 //TODO 校验数据
@ -557,7 +569,7 @@
templateId: getUrlParam('templateId'), templateId: getUrlParam('templateId'),
evaluateId: getUrlParam('id'), evaluateId: getUrlParam('id'),
id: getUrlParam('detailsId'), id: getUrlParam('detailsId'),
jsonData: JSON.stringify(tableData), jsonData: JSON.stringify(tableRowList),
titleFiled: filed.join(',') titleFiled: filed.join(',')
}; };
let path = getUrlParam("type") == '0' ? '/outsourcer/saveEvaluateData' : '/outsourcer/updateEvaluateData'; let path = getUrlParam("type") == '0' ? '/outsourcer/saveEvaluateData' : '/outsourcer/updateEvaluateData';