From 96f4b2cc66ad18d0f60e779f4d856b18bb8f71a9 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Tue, 21 Jan 2025 15:50:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/car_basic/child/framework_contract_edit_form.js | 2 +- js/car_basic/child/framework_contract_form.js | 2 +- js/car_demand_plan/child/allocation_error_form.js | 1 + js/car_demand_plan/child/apply_plan_edit_form.js | 2 +- js/car_demand_plan/child/apply_plan_form.js | 2 +- js/car_demand_plan/child/dispatch_car_edit_form.js | 10 ++++++++-- js/car_demand_plan/child/dispatch_input_edit_form.js | 10 ++++++++-- js/car_demand_plan/child/dispatch_input_form.js | 10 ++++++++-- .../child/emerg_internal_car_edit_form.js | 2 +- js/car_demand_plan/child/emerg_internal_car_form.js | 2 +- js/car_settlement/child/branch_settlement_detail.js | 6 +++--- js/car_settlement/child/settlement_detail.js | 2 +- js/car_settlement/sup_settlement_list.js | 6 +++--- page/car_basic/child/car_edit_form.html | 6 +++++- page/car_basic/child/car_form.html | 6 +++++- page/car_basic/child/driver_edit_form.html | 5 ++++- page/car_basic/child/driver_form.html | 5 ++++- page/car_basic/child/framework_contract_edit_form.html | 6 +++++- page/car_basic/child/framework_contract_form.html | 6 +++++- page/car_basic/type_list.html | 4 ++-- page/car_demand_plan/apply_plan_audit_list.html | 4 ++-- page/car_demand_plan/apply_plan_list.html | 2 +- page/car_demand_plan/arrival_confirm_list.html | 2 +- page/car_demand_plan/child/arrival_confirm_form.html | 6 +++++- page/car_demand_plan/child/dispatch_car_edit_form.html | 6 +++++- .../child/dispatch_input_edit_form.html | 6 +++++- page/car_demand_plan/child/dispatch_input_form.html | 6 +++++- .../child/emerg_internal_car_edit_form.html | 6 +++++- .../car_demand_plan/child/emerg_internal_car_form.html | 6 +++++- page/car_demand_plan/dispatch_input_list.html | 2 +- page/car_demand_plan/emerg_internal_car_list.html | 4 ++-- page/car_settlement/branch_settlement_list.html | 6 +++--- page/car_settlement/child/payment_form.html | 6 +++++- page/car_settlement/payment_list.html | 2 +- 34 files changed, 114 insertions(+), 45 deletions(-) diff --git a/js/car_basic/child/framework_contract_edit_form.js b/js/car_basic/child/framework_contract_edit_form.js index 083b719..34698d1 100644 --- a/js/car_basic/child/framework_contract_edit_form.js +++ b/js/car_basic/child/framework_contract_edit_form.js @@ -1027,7 +1027,7 @@ function checkValue(that, type) { const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { $(that).val(0); - return layer.msg('数量输入不合法,请重新输入!', { icon: 5 }) + return layer.msg('数量输入有误,请重新输入!', { icon: 5 }) } } else if (type === 2) { // 单价 diff --git a/js/car_basic/child/framework_contract_form.js b/js/car_basic/child/framework_contract_form.js index 7d71cf2..cc37c0a 100644 --- a/js/car_basic/child/framework_contract_form.js +++ b/js/car_basic/child/framework_contract_form.js @@ -819,7 +819,7 @@ function checkValue(that, type) { const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { $(that).val(0); - return layer.msg('数量输入不合法,请重新输入!', { icon: 5 }) + return layer.msg('数量输入有误,请重新输入!', { icon: 5 }) } } else if (type === 2) { // 单价 diff --git a/js/car_demand_plan/child/allocation_error_form.js b/js/car_demand_plan/child/allocation_error_form.js index 0f45c98..a6fd9b4 100644 --- a/js/car_demand_plan/child/allocation_error_form.js +++ b/js/car_demand_plan/child/allocation_error_form.js @@ -90,6 +90,7 @@ function submitApply(data) { data.field.type = item.type; data.field.contractId = item.contractId; data.field.id = data.field.planId; + data.field.proId = objParam.proId; data.field.supName = $('#supId').find('option:checked').text(); let params = { encryptedData: JSON.stringify(data.field) diff --git a/js/car_demand_plan/child/apply_plan_edit_form.js b/js/car_demand_plan/child/apply_plan_edit_form.js index 5729b37..45ac1e0 100644 --- a/js/car_demand_plan/child/apply_plan_edit_form.js +++ b/js/car_demand_plan/child/apply_plan_edit_form.js @@ -379,7 +379,7 @@ function checkValue(that, type, name) { if (type === 1 || type === 2) { // 需用量 / 需用天数 const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { - layer.msg('' + name + '输入不合法,请重新输入!', { icon: 5 }) + layer.msg('' + name + '输入有误,请重新输入!', { icon: 5 }) $(that).val(0); } } diff --git a/js/car_demand_plan/child/apply_plan_form.js b/js/car_demand_plan/child/apply_plan_form.js index 3891e02..ef0009b 100644 --- a/js/car_demand_plan/child/apply_plan_form.js +++ b/js/car_demand_plan/child/apply_plan_form.js @@ -316,7 +316,7 @@ function checkValue(that, type, name) { if (type === 1 || type === 2) { // 需用量 / 需用天数 const regex = /^(0|[1-9]\d{0,6})$/; if (!regex.test(value) && value) { - layer.msg('' + name + '输入不合法,请重新输入!', { icon: 5 }) + layer.msg('' + name + '输入有误,请重新输入!', { icon: 5 }) $(that).val(0); } } diff --git a/js/car_demand_plan/child/dispatch_car_edit_form.js b/js/car_demand_plan/child/dispatch_car_edit_form.js index fb8d9a1..d5a0972 100644 --- a/js/car_demand_plan/child/dispatch_car_edit_form.js +++ b/js/car_demand_plan/child/dispatch_car_edit_form.js @@ -609,7 +609,10 @@ function addCarFormData(id, num, item) { '
' +
'(最多上传5个附件)
' + + '提示:最多上传5个导航截图
' + + '支持格式:jpg、png、jpeg
' + + '
' +
'(最多上传5个附件)
' + + '提示:最多上传5个导航截图
' + + '支持格式:jpg、png、jpeg
' + + '
' +
'(最多上传5个附件)
' + + '提示:最多上传5个导航截图
' + + '支持格式:jpg、png、jpeg
' + + '
' +
'(最多上传5个附件)
' + + '提示:最多上传5个导航截图
' + + '支持格式:jpg、png、jpeg
' + + '
' +
'(最多上传5个附件)
' + + '提示:最多上传5个导航截图
' + + '支持格式:jpg、png、jpeg
' + + '
' +
'(最多上传5个附件)
' + + '提示:最多上传5个导航截图
' + + '支持格式:jpg、png、jpeg
' + + '
(最多上传5个附件)
+提示:最多上传5个导航截图
+支持格式:jpg、png、jpeg
+doc、docx、pdf、xlsx、xls
+
(最多上传5个附件)
+提示:最多上传5个附件
+支持格式:jpg、png、jpeg
+doc、docx、pdf、xlsx、xls
+
(最多上传5个附件)
+提示:最多上传5个附件
+支持格式:jpg、png、jpeg
+
(最多上传5个附件)
+提示:最多上传5个附件
+支持格式:jpg、png、jpeg
+
(最多上传5个附件)
+提示:最多上传5个附件
+支持格式:jpg、png、jpeg
+doc、docx、pdf、xlsx、xls
+