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