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

' + + '
' + '' + '' + ''; @@ -749,7 +752,10 @@ function addCraneFormData(id, num, isDriverSet, item) { '
' + '' + '
' + - '

(最多上传5个附件)

' + + '
' + + '

提示:最多上传5个导航截图

' + + '

支持格式:jpg、png、jpeg

' + + '
' + '' + '' + ''; diff --git a/js/car_demand_plan/child/dispatch_input_edit_form.js b/js/car_demand_plan/child/dispatch_input_edit_form.js index 5e00c6a..86f1740 100644 --- a/js/car_demand_plan/child/dispatch_input_edit_form.js +++ b/js/car_demand_plan/child/dispatch_input_edit_form.js @@ -570,7 +570,10 @@ function addCarFormData(id, num, item) { '
' + '' + '
' + - '

(最多上传5个附件)

' + + '
' + + '

提示:最多上传5个导航截图

' + + '

支持格式:jpg、png、jpeg

' + + '
' + '' + '' + ''; @@ -700,7 +703,10 @@ function addCraneFormData(id, num, isDriverSet, item) { '
' + '' + '
' + - '

(最多上传5个附件)

' + + '
' + + '

提示:最多上传5个导航截图

' + + '

支持格式:jpg、png、jpeg

' + + '
' + '' + '' + ''; diff --git a/js/car_demand_plan/child/dispatch_input_form.js b/js/car_demand_plan/child/dispatch_input_form.js index 32ff476..74d141c 100644 --- a/js/car_demand_plan/child/dispatch_input_form.js +++ b/js/car_demand_plan/child/dispatch_input_form.js @@ -652,7 +652,10 @@ function addCarFormData(id, num, item) { '
' + '' + '
' + - '

(最多上传5个附件)

' + + '
' + + '

提示:最多上传5个导航截图

' + + '

支持格式:jpg、png、jpeg

' + + '
' + '' + '' + ''; @@ -755,7 +758,10 @@ function addCraneFormData(id, num, isDriverSet, item) { '
' + '' + '
' + - '

(最多上传5个附件)

' + + '
' + + '

提示:最多上传5个导航截图

' + + '

支持格式:jpg、png、jpeg

' + + '
' + '' + '' + ''; diff --git a/js/car_demand_plan/child/emerg_internal_car_edit_form.js b/js/car_demand_plan/child/emerg_internal_car_edit_form.js index e2ef3b7..fed35e3 100644 --- a/js/car_demand_plan/child/emerg_internal_car_edit_form.js +++ b/js/car_demand_plan/child/emerg_internal_car_edit_form.js @@ -473,7 +473,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/emerg_internal_car_form.js b/js/car_demand_plan/child/emerg_internal_car_form.js index 6c9b85d..245d142 100644 --- a/js/car_demand_plan/child/emerg_internal_car_form.js +++ b/js/car_demand_plan/child/emerg_internal_car_form.js @@ -403,7 +403,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_settlement/child/branch_settlement_detail.js b/js/car_settlement/child/branch_settlement_detail.js index 45e25b9..773704f 100644 --- a/js/car_settlement/child/branch_settlement_detail.js +++ b/js/car_settlement/child/branch_settlement_detail.js @@ -22,9 +22,9 @@ function setDataView() { $('#needNum').html(objParam.needNum); $('#carNum').html(objParam.carNum); $('#dpcNum').html(objParam.dpcNum); - $('#money').html(objParam.money); - $('#payMoney').html(objParam.payMoney); - $('#noPayMoney').html(objParam.noPayMoney); + $('#money').html('¥ ' + objParam.money); + $('#payMoney').html('¥ ' + objParam.payMoney); + $('#noPayMoney').html('¥ ' + objParam.noPayMoney); } // 查询/重置 diff --git a/js/car_settlement/child/settlement_detail.js b/js/car_settlement/child/settlement_detail.js index 26b437b..a517863 100644 --- a/js/car_settlement/child/settlement_detail.js +++ b/js/car_settlement/child/settlement_detail.js @@ -41,7 +41,7 @@ function getSltDetailsInfo() { $('#planCode').html("" + obj.code + ""); $('#proName').html(obj.proName); $('#carNum').html(obj.carNum); - $('#money').html(obj.money); + $('#money').html('¥' + obj.money); $('#dispatchDay').html(obj.dispatchDay); $('#remark').html(obj.remark); // 附件文档 diff --git a/js/car_settlement/sup_settlement_list.js b/js/car_settlement/sup_settlement_list.js index f014b24..69b399b 100644 --- a/js/car_settlement/sup_settlement_list.js +++ b/js/car_settlement/sup_settlement_list.js @@ -26,9 +26,9 @@ function getSltSupInformation() { $('#num').html(parseInt(obj.proNum)); $('#num2').html(obj.needPlan); $('#num3').html(parseInt(obj.supNum)); - $('#num4').html(parseInt(obj.money)); - $('#num5').html(parseInt(obj.payMoney)); - $('#num6').html(parseInt(obj.noPayMoney)); + $('#num4').html('¥' + parseInt(obj.money)); + $('#num5').html('¥' + parseInt(obj.payMoney)); + $('#num6').html('¥' + parseInt(obj.noPayMoney)); } } diff --git a/page/car_basic/child/car_edit_form.html b/page/car_basic/child/car_edit_form.html index aa66c72..f740e79 100644 --- a/page/car_basic/child/car_edit_form.html +++ b/page/car_basic/child/car_edit_form.html @@ -146,7 +146,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个导航截图

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_basic/child/car_form.html b/page/car_basic/child/car_form.html index ccd5e5c..634f3a2 100644 --- a/page/car_basic/child/car_form.html +++ b/page/car_basic/child/car_form.html @@ -146,7 +146,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_basic/child/driver_edit_form.html b/page/car_basic/child/driver_edit_form.html index ae001c5..d09868b 100644 --- a/page/car_basic/child/driver_edit_form.html +++ b/page/car_basic/child/driver_edit_form.html @@ -114,7 +114,10 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+
diff --git a/page/car_basic/child/driver_form.html b/page/car_basic/child/driver_form.html index efe1df8..91afe3b 100644 --- a/page/car_basic/child/driver_form.html +++ b/page/car_basic/child/driver_form.html @@ -114,7 +114,10 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+
diff --git a/page/car_basic/child/framework_contract_edit_form.html b/page/car_basic/child/framework_contract_edit_form.html index 07b3cf3..ab4e539 100644 --- a/page/car_basic/child/framework_contract_edit_form.html +++ b/page/car_basic/child/framework_contract_edit_form.html @@ -97,7 +97,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_basic/type_list.html b/page/car_basic/type_list.html index 6281497..662eea4 100644 --- a/page/car_basic/type_list.html +++ b/page/car_basic/type_list.html @@ -24,9 +24,9 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(类型/名称/规格)" maxlength="30">
diff --git a/page/car_demand_plan/apply_plan_audit_list.html b/page/car_demand_plan/apply_plan_audit_list.html index b020fc7..9cc47a5 100644 --- a/page/car_demand_plan/apply_plan_audit_list.html +++ b/page/car_demand_plan/apply_plan_audit_list.html @@ -51,9 +51,9 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(计划单号/工程名称/项目部分)" maxlength="30">
diff --git a/page/car_demand_plan/apply_plan_list.html b/page/car_demand_plan/apply_plan_list.html index afb8dbf..169b3ee 100644 --- a/page/car_demand_plan/apply_plan_list.html +++ b/page/car_demand_plan/apply_plan_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(计划编号/工程名称/申请人)" maxlength="30">
diff --git a/page/car_demand_plan/arrival_confirm_list.html b/page/car_demand_plan/arrival_confirm_list.html index 81d5b4c..bd2bfd7 100644 --- a/page/car_demand_plan/arrival_confirm_list.html +++ b/page/car_demand_plan/arrival_confirm_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(需求计划编号/申请人)" maxlength="30">
diff --git a/page/car_demand_plan/child/arrival_confirm_form.html b/page/car_demand_plan/child/arrival_confirm_form.html index 4956ecb..7a87498 100644 --- a/page/car_demand_plan/child/arrival_confirm_form.html +++ b/page/car_demand_plan/child/arrival_confirm_form.html @@ -21,7 +21,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_demand_plan/child/dispatch_car_edit_form.html b/page/car_demand_plan/child/dispatch_car_edit_form.html index 7d720f1..7b19d37 100644 --- a/page/car_demand_plan/child/dispatch_car_edit_form.html +++ b/page/car_demand_plan/child/dispatch_car_edit_form.html @@ -88,7 +88,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_demand_plan/child/dispatch_input_edit_form.html b/page/car_demand_plan/child/dispatch_input_edit_form.html index bf65ff0..2d9784f 100644 --- a/page/car_demand_plan/child/dispatch_input_edit_form.html +++ b/page/car_demand_plan/child/dispatch_input_edit_form.html @@ -88,7 +88,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_demand_plan/child/dispatch_input_form.html b/page/car_demand_plan/child/dispatch_input_form.html index 755eaff..cdade60 100644 --- a/page/car_demand_plan/child/dispatch_input_form.html +++ b/page/car_demand_plan/child/dispatch_input_form.html @@ -91,7 +91,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_demand_plan/child/emerg_internal_car_edit_form.html b/page/car_demand_plan/child/emerg_internal_car_edit_form.html index 012cb5f..c3a889b 100644 --- a/page/car_demand_plan/child/emerg_internal_car_edit_form.html +++ b/page/car_demand_plan/child/emerg_internal_car_edit_form.html @@ -82,7 +82,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_demand_plan/child/emerg_internal_car_form.html b/page/car_demand_plan/child/emerg_internal_car_form.html index 4d56a76..c2a0692 100644 --- a/page/car_demand_plan/child/emerg_internal_car_form.html +++ b/page/car_demand_plan/child/emerg_internal_car_form.html @@ -82,7 +82,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_demand_plan/dispatch_input_list.html b/page/car_demand_plan/dispatch_input_list.html index e298279..6f98d6b 100644 --- a/page/car_demand_plan/dispatch_input_list.html +++ b/page/car_demand_plan/dispatch_input_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(需求计划编号/工程名称)" maxlength="30">
diff --git a/page/car_demand_plan/emerg_internal_car_list.html b/page/car_demand_plan/emerg_internal_car_list.html index 86f95f7..fa4bd5e 100644 --- a/page/car_demand_plan/emerg_internal_car_list.html +++ b/page/car_demand_plan/emerg_internal_car_list.html @@ -21,9 +21,9 @@
-
+
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(计划编号/工程名称/申请人)" maxlength="30">
diff --git a/page/car_settlement/branch_settlement_list.html b/page/car_settlement/branch_settlement_list.html index 2aae677..d8e10a1 100644 --- a/page/car_settlement/branch_settlement_list.html +++ b/page/car_settlement/branch_settlement_list.html @@ -68,15 +68,15 @@

应付金额

-

¥1,280,000

+

¥0

已付金额

-

+

¥0

待付金额

-

¥280,000

+

¥0

diff --git a/page/car_settlement/child/payment_form.html b/page/car_settlement/child/payment_form.html index 382ddb9..2964c1a 100644 --- a/page/car_settlement/child/payment_form.html +++ b/page/car_settlement/child/payment_form.html @@ -70,7 +70,11 @@
-

(最多上传5个附件)

+
+

提示:最多上传5个附件

+

支持格式:jpg、png、jpeg

+

doc、docx、pdf、xlsx、xls

+
diff --git a/page/car_settlement/payment_list.html b/page/car_settlement/payment_list.html index ca70f05..b2d9965 100644 --- a/page/car_settlement/payment_list.html +++ b/page/car_settlement/payment_list.html @@ -23,7 +23,7 @@
+ class="layui-input" lay-affix="clear" placeholder="输入关键字(供应商名称)" maxlength="30">