diff --git a/js/demandPlan/child/apply_plan_form.js b/js/demandPlan/child/apply_plan_form.js index 6184d3b..aab92cc 100644 --- a/js/demandPlan/child/apply_plan_form.js +++ b/js/demandPlan/child/apply_plan_form.js @@ -71,26 +71,22 @@ function submitApply(data) { let list = getBaseTableData(); // 校验配件入库数量 if (list.length === 0) { - return layer.msg('未填写配件入库数量', { icon: 7 }); + return layer.msg('未添加机具数据', { icon: 7 }); } for (let i = 0; i < list.length; i++) { - - if (!list[i].inputNum || list[i].inputNum === '0') { - return layer.msg('入库配件明细,第' + (i + 1) + '行,未填写配件入库数量', { icon: 7 }); + if (list[i].needNum === 0) { + return layer.msg('机具明细,第' + (i + 1) + '行,未填写需用量', { icon: 7 }); + } + if (list[i].times === 0) { + return layer.msg('机具明细,第' + (i + 1) + '行,未填写需用天数', { icon: 7 }); } } - data.field.details = list; - let formData = new FormData(); - //遍历最终文件集合 - for (let i = 0; i < fileList.length; i++) { - formData.append("file[]", fileList[i].file) - } - formData.append('params', JSON.stringify(data.field)); - console.log(JSON.stringify(data.field)); + data.field.jsonData = JSON.stringify(list); let loadingMsg = layer.msg('正在提交保存,请稍等...', { icon: 16, shade: 0.01, time: '0' }); console.log(JSON.stringify(data.field)); - let url = dataUrl + 'backstage/partInput/addInputData'; - ajaxRequestByUploadFile(url, formData, function () { + let url = dataUrl + 'backstage/planApplication/addPlan'; + let params = JSON.stringify(data.field); + ajaxRequest(url, 'POST', params, true, function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); }, function (result) { @@ -110,26 +106,24 @@ function submitApply(data) { $('.save').removeClass("layui-btn-disabled").attr("disabled", false); $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false); errorFn(xhr, status, error) - }, null); + }, 'application/json'); } -// 获取入库配件明细数据 +// 获取机具明细数据 function getBaseTableData() { let tableData = []; $('#baseTable tbody tr').each(function (index, item) { - let price = $(this).find('td').eq(7).find('input[name="price"]').val(); - let num = $(this).find('td').eq(6).find('input[name="num"]').val(); + let times = $(this).find('td').eq(7).find('input[name="times"]').val(); + let needNum = $(this).find('td').eq(6).find('input[name="needNum"]').val(); tableData.push({ - partId: $(this).attr('id'), - partType: $(this).find('td').eq(2).html(), - partName: $(this).find('td').eq(3).html(), - partModel: $(this).find('td').eq(4).html(), - partUnit: $(this).find('td').eq(5).html(), - inputNum: num ? num : 0, - partPrice: price ? price : 0, - vendId: $(this).find('td').eq(8).find('select[name="manufacturer"]').val(), - vendName: $(this).find('td').eq(8).find('select[name="manufacturer"]').find('option:checked').text(), - remark: $(this).find('td').eq(9).find('input[name="remarks"]').val(), + moduleId: $(this).attr('id'), + type: $(this).find('td').eq(2).html(), + typeName: $(this).find('td').eq(3).html(), + module: $(this).find('td').eq(4).html(), + unit: $(this).find('td').eq(5).html(), + needNum: needNum ? needNum : 0, + times: times ? times : 0, + remarks: $(this).find('td').eq(8).find('input[name="remarks"]').val(), }) }) return tableData; @@ -191,7 +185,6 @@ function search() { function resetSearch() { $('#type').val(''); $('#name').val(''); - $('#model').val(''); setTableData(jjDataArr); } diff --git a/js/demandPlan/child/choose_tool_type_list.js b/js/demandPlan/child/choose_tool_type_list.js index a14c458..f1f7bae 100644 --- a/js/demandPlan/child/choose_tool_type_list.js +++ b/js/demandPlan/child/choose_tool_type_list.js @@ -244,6 +244,7 @@ function initTable() { } } } + $('#num').html(huancun.length); }); } diff --git a/page/demandPlan/child/choose_tool_type_list.html b/page/demandPlan/child/choose_tool_type_list.html index 29563e8..3c56ace 100644 --- a/page/demandPlan/child/choose_tool_type_list.html +++ b/page/demandPlan/child/choose_tool_type_list.html @@ -59,6 +59,9 @@ +
+

已选:0

+