From 8a1f31d4c23475c3b5ba4dee8e607e9f8c9a7830 Mon Sep 17 00:00:00 2001 From: hayu <1604366271@qq.com> Date: Tue, 8 Jul 2025 11:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../child/dispatch_car_detail.js | 2 +- .../child/dispatch_car_edit_record_detail.js | 2 +- .../child/dispatch_car_pro_detail.js | 2 +- .../child/dispatch_input_detail.js | 2 +- .../child/dispatch_input_form.js | 61 ++++++++++++++++--- .../child/dispatch_input_form.html | 1 + 6 files changed, 58 insertions(+), 12 deletions(-) diff --git a/js/car_demand_plan/child/dispatch_car_detail.js b/js/car_demand_plan/child/dispatch_car_detail.js index d2ba09d..54a0fcc 100644 --- a/js/car_demand_plan/child/dispatch_car_detail.js +++ b/js/car_demand_plan/child/dispatch_car_detail.js @@ -127,7 +127,7 @@ function getDispatchCarListData(id) { '' + item.model + '' + '' + item.unit + '' + '' + item.needNum + '' + - '' + item.needDay + '' + + '' + (item.needDay !== null ? item.needDay : '') + '' + '' + item.remark + '' + ''; }) diff --git a/js/car_demand_plan/child/dispatch_car_edit_record_detail.js b/js/car_demand_plan/child/dispatch_car_edit_record_detail.js index cca5fa8..498de17 100644 --- a/js/car_demand_plan/child/dispatch_car_edit_record_detail.js +++ b/js/car_demand_plan/child/dispatch_car_edit_record_detail.js @@ -51,7 +51,7 @@ function getRecordList(id) { '' + item.model + '' + '' + item.unit + '' + '' + item.needNum + '' + - '' + item.needDay + '' + + '' + (item.needDay !== null ? item.needDay : '') + '' + '' + item.remark + '' + ''; }) diff --git a/js/car_demand_plan/child/dispatch_car_pro_detail.js b/js/car_demand_plan/child/dispatch_car_pro_detail.js index 12a854a..69285fe 100644 --- a/js/car_demand_plan/child/dispatch_car_pro_detail.js +++ b/js/car_demand_plan/child/dispatch_car_pro_detail.js @@ -381,7 +381,7 @@ function isExistData(type, obj) { if (type === 1 || type === 3) { url = dataUrl + 'backstage/supDispatchCar/getAllOutList'; // 详情-派车批次 } else if (type === 2) { // 审核-待审核批次 - url = dataUrl + 'backstage/dispatchCar/getAuditListNew'; + url = dataUrl + 'backstage/dispatchCar/getAuditList'; } ajaxRequest(url, "POST", params, false, function () { }, function (result) { diff --git a/js/car_demand_plan/child/dispatch_input_detail.js b/js/car_demand_plan/child/dispatch_input_detail.js index 8007095..1d52031 100644 --- a/js/car_demand_plan/child/dispatch_input_detail.js +++ b/js/car_demand_plan/child/dispatch_input_detail.js @@ -124,7 +124,7 @@ function getDispatchCarListData(id) { '' + item.model + '' + '' + item.unit + '' + '' + item.needNum + '' + - '' + item.needDay + '' + + '' + (item.needDay !== null ? item.needDay : '') + '' + '' + item.remark + '' + ''; }) diff --git a/js/car_demand_plan/child/dispatch_input_form.js b/js/car_demand_plan/child/dispatch_input_form.js index a1ecf75..fa18890 100644 --- a/js/car_demand_plan/child/dispatch_input_form.js +++ b/js/car_demand_plan/child/dispatch_input_form.js @@ -149,6 +149,7 @@ function setPlanTables(list) { let html = ''; if (list && list.length > 0) { $.each(list, function (index, item) { + console.log("item", item); html += "" + "" + "" + (index + 1) + "" + @@ -157,6 +158,10 @@ function setPlanTables(list) { "" + item.model + "" + "" + item.unit + "" + "" + item.needNum + "" + + "" + "" + (item.needDay !== null ? item.needDay : '') + "" + "" + handleRemark(item.remark) + "" + ""; @@ -167,6 +172,21 @@ function setPlanTables(list) { $('#plan-table tbody').after(html); } +// 验证数字输入的函数 +function validateNumberInput(input, maxNeedNum) { + let value = parseInt(input.value); + const maxAllowed = Math.min(99, maxNeedNum); // 不能超过99也不能超过needNum + + if (isNaN(value) || value <= 0 || value > maxAllowed) { + // 如果输入无效，恢复之前的值或设为空 + input.value = input.dataset.prevValue || ''; + layer.msg('此次派车量不能大于需用量', { icon: 7 }) + } else { + // 保存当前有效值 + input.dataset.prevValue = value; + } +} + // 处理备注 function handleRemark(remark) { if (remark) { @@ -185,15 +205,25 @@ function selectAll(selectStatus) {//传入参数（全选框的选中状态） if (selectStatus) { $("input[name='check']").each(function (i, n) { n.checked = true; - let item = JSON.parse($(this).parents('tr').attr('item')); + let tr = $(this).parents('tr'); + let item = JSON.parse(tr.attr('item')); + console.log(item) + // 获取手动输入的值 + let inputValue = tr.find('.need-nums-input').val(); + let needNums = inputValue ? parseInt(inputValue) : 0; + console.log('手动输入的值:', needNums); // 打印输入的值 + if (needNums<=0){ + n.checked = false; + return layer.msg('请先选择此次派车量', {icon: 7}) + } if (item.type === '车辆') { carType=1; - for (let i = 1; i <= item.needNum; i++) { + for (let i = 1; i <= needNums; i++) { addCarFormData(item.modelId, i, item); } } else if (item.type === '吊车') { carType=2; - for (let i = 1; i <= item.needNum; i++) { + for (let i = 1; i <= needNums; i++) { addCraneFormData(item.modelId, i, item.isDriverSet, item); } } @@ -202,6 +232,7 @@ function selectAll(selectStatus) {//传入参数（全选框的选中状态） $("input[name='check']").each(function (i, n) { n.checked = false; let item = JSON.parse($(this).parents('tr').attr('item')); + console.log(item) if (item.type === '车辆') { removeCarFormData(item.modelId); fileList = fileList.filter(l => { @@ -221,17 +252,27 @@ function selectAll(selectStatus) {//传入参数（全选框的选中状态） function sel(selectStatus, that, id) { console.error(fileList); - let item = JSON.parse($(that).parents('tr').attr('item')); + let tr = $(that).parents('tr'); + let item = JSON.parse(tr.attr('item')); + console.log(item) + // 获取手动输入的值 + let inputValue = tr.find('.need-nums-input').val(); + let needNums = inputValue ? parseInt(inputValue) : 0; + console.log('手动输入的值:', needNums); // 打印输入的值 + if (needNums<=0){ + $(that).prop('checked', false); + return layer.msg('请先选择此次派车量', {icon: 7}) + } if (selectStatus) { $(that).prop('checked', true); if (item.type === '车辆') { carType=1; - for (let i = 1; i <= item.needNum; i++) { + for (let i = 1; i <= needNums; i++) { addCarFormData(item.modelId, i, item); } } else if (item.type === '吊车') { carType=2; - for (let i = 1; i <= item.needNum; i++) { + for (let i = 1; i <= needNums; i++) { addCraneFormData(item.modelId, i, item.isDriverSet, item); } } @@ -316,8 +357,12 @@ function submitApply(data) { let check = n.checked; if (check === true) { num++; - let item = JSON.parse($(this).parents('tr').attr('item')); - for (let i = 1; i <= item.needNum; i++) { + let tr = $(this).parents('tr'); + let item = JSON.parse(tr.attr('item')); + // 获取手动输入的值 + let inputValue = tr.find('.need-nums-input').val(); + let needNums = inputValue ? parseInt(inputValue) : 0; + for (let i = 1; i <= needNums; i++) { let dhFiles = fileList.filter(item2 => { return item2.type === item.modelId + '-' + i; }) diff --git a/page/car_demand_plan/child/dispatch_input_form.html b/page/car_demand_plan/child/dispatch_input_form.html index f1c7e28..5c6450d 100644 --- a/page/car_demand_plan/child/dispatch_input_form.html +++ b/page/car_demand_plan/child/dispatch_input_form.html @@ -44,6 +44,7 @@ 规格 单位 需用量 + 此次派车量 需用天数 备注