From a196825d362a9004748d4b4c2c323cdfa0b005dc Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sat, 16 Nov 2024 17:39:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/accessory/child/accessory_return_form.js | 6 +++--- js/accessory/child/choose_return_fit_type_list.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/accessory/child/accessory_return_form.js b/js/accessory/child/accessory_return_form.js index 00a60a2..025cdab 100644 --- a/js/accessory/child/accessory_return_form.js +++ b/js/accessory/child/accessory_return_form.js @@ -283,7 +283,7 @@ function addFitDatas(data, userId) { if (jjDataArr.length > 0) { // 继续添加数据 let newJjDataArr = JSON.parse(data); $.each(newJjDataArr, function (index, item) { - updateOrAddObject(item.id, item); + updateOrAddObject(item.partId, item); }); setTableData(jjDataArr); } else { // 第一次添加数据 @@ -297,7 +297,7 @@ function addFitDatas(data, userId) { } function updateOrAddObject(id, newObject) { - const index = jjDataArr.findIndex(obj => obj.id === id); + const index = jjDataArr.findIndex(obj => obj.partId === id); if (index !== -1) { // 如果对象存在,则替换它 jjDataArr[index] = newObject; @@ -417,7 +417,7 @@ function checkValue(that, type) { if (!regex.test(value) && value) { $(that).val(0); return layer.msg('本次退回量输入不合法,请重新输入!', { icon: 5 }) - } else if (value && value > lyNum) { + } else if (value && parseInt(value) > parseInt(lyNum)) { $(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 7926713..97bad5d 100644 --- a/js/accessory/child/choose_return_fit_type_list.js +++ b/js/accessory/child/choose_return_fit_type_list.js @@ -142,7 +142,7 @@ function initTable() { unresize: true, align: "center", edit: 'text', - style: 'outline: 1px solpartId #e6e6e6;outline-offset: -5px;' + style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;' }, { field: "remark", @@ -151,7 +151,7 @@ function initTable() { unresize: true, align: "center", edit: 'textarea', - style: 'outline: 1px solpartId #e6e6e6;outline-offset: -5px;' + style: 'outline: 1px solid #e6e6e6;outline-offset: -5px;' }, ],