From 757fa3958fc9dd9d2558d0e1b36bdc34a6065ed3 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 15 Nov 2024 09:30:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/accessory/child/accessory_return_form.js | 74 ++++++++++--------- js/accessory/child/accessory_store_form.js | 11 +-- .../child/choose_return_fit_type_list.js | 21 +++--- .../child/accessory_return_form.html | 13 ++-- 4 files changed, 60 insertions(+), 59 deletions(-) diff --git a/js/accessory/child/accessory_return_form.js b/js/accessory/child/accessory_return_form.js index f1a2bb5..bf7684c 100644 --- a/js/accessory/child/accessory_return_form.js +++ b/js/accessory/child/accessory_return_form.js @@ -155,17 +155,17 @@ function submitApply(data) { if (fileList.length === 0) { return layer.msg('请上传附件证明', { icon: 7 }); } - // 校验配件入库数量 + // 校验配件退回数量 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 }); } } - data.field.details = list; + data.field.detailsVoList = list; + data.field.userName = $('#createId').find('option:checked').text(); let formData = new FormData(); //遍历最终文件集合 for (let i = 0; i < fileList.length; i++) { @@ -175,7 +175,7 @@ function submitApply(data) { console.log(JSON.stringify(data.field)); let loadingMsg = layer.msg('正在提交保存,请稍等...', { icon: 16, shade: 0.01, time: '0' }); console.log(JSON.stringify(data.field)); - let url = dataUrl + 'backstage/partInput/addInputData'; + let url = dataUrl + 'backstage/partBack/backInfo'; ajaxRequestByUploadFile(url, formData, function () { $('.save').addClass("layui-btn-disabled").attr("disabled", true); $('.cancel').addClass("layui-btn-disabled").attr("disabled", true); @@ -203,19 +203,15 @@ function submitApply(data) { 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 ghNum = $(this).find('td').eq(7).find('input[name="ghNum"]').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(), + backNum: ghNum ? ghNum : 0, + remark: $(this).find('td').eq(8).find('input[name="remark"]').val(), }) }) return tableData; @@ -234,44 +230,44 @@ function chooseFitType() { // 查询 function search() { - let keyWord = $('#type').val(); - let keyWord2 = $('#name').val(); - let keyWord3 = $('#model').val(); + let keyWord = $('#partType').val(); + let keyWord2 = $('#partName').val(); + let keyWord3 = $('#partModel').val(); if (!keyWord && !keyWord2 && !keyWord3) { setTableData(jjDataArr); } else if (keyWord && !keyWord2 && !keyWord3) { let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1; + return item.partType.indexOf(keyWord) > -1; }) setTableData(dataList); } else if (!keyWord && keyWord2 && !keyWord3) { let dataList = jjDataArr.filter(item => { - return item.name.indexOf(keyWord2) > -1; + return item.partName.indexOf(keyWord2) > -1; }) setTableData(dataList); } else if (!keyWord && !keyWord2 && keyWord3) { let dataList = jjDataArr.filter(item => { - return item.model.indexOf(keyWord3) > -1; + return item.partModel.indexOf(keyWord3) > -1; }) setTableData(dataList); } else if (keyWord && keyWord2 && !keyWord3) { let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1 && item.name.indexOf(keyWord2) > -1; + return item.partType.indexOf(keyWord) > -1 && item.partName.indexOf(keyWord2) > -1; }) setTableData(dataList); } else if (keyWord && !keyWord2 && keyWord3) { let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1 && item.model.indexOf(keyWord3) > -1; + return item.partType.indexOf(keyWord) > -1 && item.partModel.indexOf(keyWord3) > -1; }) setTableData(dataList); } else if (!keyWord && keyWord2 && keyWord3) { let dataList = jjDataArr.filter(item => { - return item.name.indexOf(keyWord2) > -1 && item.model.indexOf(keyWord3) > -1; + return item.partName.indexOf(keyWord2) > -1 && item.partModel.indexOf(keyWord3) > -1; }) setTableData(dataList); } else if (keyWord && keyWord2 && keyWord3) { let dataList = jjDataArr.filter(item => { - return item.type.indexOf(keyWord) > -1 && item.name.indexOf(keyWord2) > -1 && item.model.indexOf(keyWord3) > -1; + return item.partType.indexOf(keyWord) > -1 && item.partName.indexOf(keyWord2) > -1 && item.partModel.indexOf(keyWord3) > -1; }) setTableData(dataList); } @@ -279,9 +275,9 @@ function search() { // 重置 function resetSearch() { - $('#type').val(''); - $('#name').val(''); - $('#model').val(''); + $('#partType').val(''); + $('#partName').val(''); + $('#partModel').val(''); setTableData(jjDataArr); } @@ -328,16 +324,17 @@ function setTableData(results) { html += ''; html += "" + (i + 1) + ""; - html += "" + l.type + ""; - html += "" + l.name + ""; - html += "" + l.model + ""; - html += "" + l.unit + ""; - html += "" + setFormInput(l.num, 1) + ""; - html += "" + setFormInput(l.remarks, 2) + ""; + html += "" + l.partType + ""; + html += "" + l.partName + ""; + html += "" + l.partModel + ""; + html += "" + l.partUnit + ""; + html += "" + l.lyNum + ""; + html += "" + setFormInput(l.num, 1) + ""; + html += "" + setFormInput(l.remark, 2) + ""; html += ""; } } else { - html += "没有相关数据"; + html += "没有相关数据"; } $("#baseTable tbody").empty().append(html); layui.form.render(); @@ -346,9 +343,9 @@ function setTableData(results) { function setFormInput(value, type) { let html = '
'; if (type === 1) { // 本次退回量 - html += ''; + html += ''; } else if (type === 2) { // 备注 - html += ''; + html += ''; } html += '
'; return html; @@ -419,11 +416,16 @@ function delFitType() { // 校验数据 function checkValue(that, type) { let value = $(that).val(); + let lyNum = $(that).parents('td').attr('lyNum'); + console.log('领用数量：' + lyNum); if (type === 1) { // 本次退回量 const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { - layer.msg(' 本次退回量输入不合法，请重新输入!', { icon: 5 }) - $(that).val(''); + $(that).val(0); + return layer.msg('本次退回量输入不合法，请重新输入!', { icon: 5 }) + } else if (value && value > lyNum) { + $(that).val(0); + return layer.msg('本次退回量不能超过累计领料数量，请重新输入!', { icon: 5 }) } } } diff --git a/js/accessory/child/accessory_store_form.js b/js/accessory/child/accessory_store_form.js index 4214bbb..4322829 100644 --- a/js/accessory/child/accessory_store_form.js +++ b/js/accessory/child/accessory_store_form.js @@ -33,7 +33,7 @@ function setParams(obj) { bindAction: '#hideUpload', //绑定的按钮 choose: function (obj) { let length = $('.file-iteme').length; - if(length >= 5){ + if (length >= 5) { return layer.msg('最多上传5个附件证明', { icon: 7 }); } uploadObj.config.elem.next()[0].value = ''; @@ -419,14 +419,15 @@ function checkValue(that, type) { if (type === 1) { // 入库量 const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { - layer.msg('入库量输入不合法，请重新输入!', { icon: 5 }) - $(that).val(''); + $(that).val(0); + return layer.msg('入库量输入不合法，请重新输入!', { icon: 5 }) + } } else if (type === 2) { // 单价 const regex = /^(?:1(?:\d{0,8}|[0-9]*\.\d{1,2})|(?:[1-9]\d{0,7}|[1-9]\d{0,6}\.\d{1,2}|[1-9]\d{1,7}\.\d{2}|100000000(?:\.00)?))$/; if (!regex.test(value) && value) { - layer.msg('单价输入不合法，请重新输入!', { icon: 5 }) - $(that).val(''); + $(that).val(0); + return layer.msg('单价输入不合法，请重新输入!', { icon: 5 }) } } } diff --git a/js/accessory/child/choose_return_fit_type_list.js b/js/accessory/child/choose_return_fit_type_list.js index af0b84a..1e70ab0 100644 --- a/js/accessory/child/choose_return_fit_type_list.js +++ b/js/accessory/child/choose_return_fit_type_list.js @@ -77,10 +77,8 @@ function initTable() { $.each(res.list, function (index, item) { $.each(jjDetailArr, function (index2, item2) { if (item.id === item2.id) { - item.num = item2.num; - item.price = item2.price; - item.remarks = item2.remarks; - item.manufacturer = item2.manufacturer; + item.ghNum = item2.ghNum; + item.remark = item2.remark; } }); }); @@ -192,21 +190,20 @@ function initTable() { table.on('edit(currentTableId2)', function (obj) { var field = obj.field; // 得到修改的字段 var value = obj.value // 得到修改后的值 - if (field === 'num') { // 本次入库量 + if (field === 'ghNum') { // 本次退回量 if (value) { const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value)) { obj.reedit(); return layer.msg('格式不正确，最大输入6位数，且为正整数！', { icon: 7 }) } + // 获取累计领料数量 + let lyNum = obj.data.lyNum ? obj.data.lyNum : 0; + if(value > lyNum){ + return layer.msg('本次退回量不能超过累计领料数量', { icon: 7 }) + } } - } else if (field === 'price') { - const regex = /^(?:1(?:\d{0,8}|[0-9]*\.\d{1,2})|(?:[1-9]\d{0,7}|[1-9]\d{0,6}\.\d{1,2}|[1-9]\d{1,7}\.\d{2}|100000000(?:\.00)?))$/; - if (!regex.test(value)) { - obj.reedit(); - return layer.msg('单价格式不正确！', { icon: 7 }) - } - } else if (field === 'remarks') { // 备注 + } else if (field === 'remark') { // 备注 if (value) { if (value.length > 255) { obj.reedit(); diff --git a/page/accessory/child/accessory_return_form.html b/page/accessory/child/accessory_return_form.html index c70490e..572f9d2 100644 --- a/page/accessory/child/accessory_return_form.html +++ b/page/accessory/child/accessory_return_form.html @@ -63,7 +63,7 @@

您还没选择退料配件类型

需要添加配件类型后才能执行退料入库操作

只可退回选择的维修人员已经领用过的配件类型

- +