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 4ceac6b..0cc7a7b 100644
--- a/js/car_demand_plan/child/apply_plan_edit_form.js
+++ b/js/car_demand_plan/child/apply_plan_edit_form.js
@@ -403,15 +403,15 @@ function goOnAddData() {
if (parseInt(id) === parseInt(item.id)) {
let times = $(this).find('td').eq(7).find('input[name="times"]').val(),
needNum = $(this).find('td').eq(6).find('input[name="needNum"]').val(),
- remark = $(this).find('td').eq(8).find('input[name="remarks"]').val();
- if (!item.times || item.times === 0) {
+ remarks = $(this).find('td').eq(8).find('input[name="remarks"]').val();
+ if (!item.times || parseInt(item.times) === 0) {
item.times = times;
}
- if (!item.needNum || item.needNum === 0) {
+ if (!item.needNum || parseInt(item.needNum) === 0) {
item.needNum = needNum;
}
- if (!item.needNum || item.remark === 0) {
- item.remark = remark;
+ if (!item.remarks) {
+ item.remarks = remarks;
}
}
})
diff --git a/js/car_demand_plan/child/apply_plan_form.js b/js/car_demand_plan/child/apply_plan_form.js
index 5301428..5bb4567 100644
--- a/js/car_demand_plan/child/apply_plan_form.js
+++ b/js/car_demand_plan/child/apply_plan_form.js
@@ -338,15 +338,15 @@ function goOnAddData() {
if (parseInt(id) === parseInt(item.id)) {
let times = $(this).find('td').eq(7).find('input[name="times"]').val(),
needNum = $(this).find('td').eq(6).find('input[name="needNum"]').val(),
- remark = $(this).find('td').eq(8).find('input[name="remarks"]').val();
- if (!item.times || item.times === 0) {
+ remarks = $(this).find('td').eq(8).find('input[name="remarks"]').val();
+ if (!item.times || parseInt(item.times) === 0) {
item.times = times;
}
- if (!item.needNum || item.needNum === 0) {
+ if (!item.needNum || parseInt(item.needNum) === 0) {
item.needNum = needNum;
}
- if (!item.needNum || item.remark === 0) {
- item.remark = remark;
+ if (!item.remarks) {
+ item.remarks = remarks;
}
}
})
diff --git a/js/car_demand_plan/child/arrival_confirm_detail.js b/js/car_demand_plan/child/arrival_confirm_detail.js
index 57fbe98..c59f3a1 100644
--- a/js/car_demand_plan/child/arrival_confirm_detail.js
+++ b/js/car_demand_plan/child/arrival_confirm_detail.js
@@ -200,7 +200,7 @@ function getDispatchCarData(id) {
'
' + item.useAddress + ' | ' +
'' + item.planDay + ' | ' +
'' + setZlPrice(item) + ' | ' +
- ' ¥ ' + item.dcMoney + ' | ' +
+ ' ¥ ' + item.cost + ' | ' +
"" + imgNum + "查看附件>> | " +
'' + supName + ' | ' +
'';
diff --git a/js/car_demand_plan/child/dispatch_car_detail.js b/js/car_demand_plan/child/dispatch_car_detail.js
index 2ad9d61..ae39213 100644
--- a/js/car_demand_plan/child/dispatch_car_detail.js
+++ b/js/car_demand_plan/child/dispatch_car_detail.js
@@ -284,7 +284,7 @@ function getDispatchCarData(id) {
'' + item.useAddress + ' | ' +
'' + item.planDay + ' | ' +
'' + setZlPrice(item) + ' | ' +
- ' ¥ ' + item.dcMoney + ' | ' +
+ ' ¥ ' + item.cost + ' | ' +
"" + imgNum + "查看附件>> | " +
'' + objParam.supName + ' | ' +
'';
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 2698292..5707ca3 100644
--- a/js/car_demand_plan/child/dispatch_car_pro_detail.js
+++ b/js/car_demand_plan/child/dispatch_car_pro_detail.js
@@ -259,8 +259,10 @@ function initTable() {
if (!d.supId) {
html += "|
派车分配";
}
- html += "|
修改记录";
- html += "|
审核";
+ if (d.statusName !== '待派车') {
+ html += "|
审核";
+ html += "|
修改记录";
+ }
return html;
},
},
diff --git a/js/car_demand_plan/child/dispatch_input_detail.js b/js/car_demand_plan/child/dispatch_input_detail.js
index 47d44eb..57ea59f 100644
--- a/js/car_demand_plan/child/dispatch_input_detail.js
+++ b/js/car_demand_plan/child/dispatch_input_detail.js
@@ -280,7 +280,7 @@ function getDispatchCarData(id) {
'' + item.useAddress + ' | ' +
'' + item.planDay + ' | ' +
'' + setZlPrice(item) + ' | ' +
- ' ¥ ' + item.dcMoney + ' | ' +
+ ' ¥ ' + item.cost + ' | ' +
"" + imgNum + "查看附件>> | " +
'' + (objParam.supName || dataObj.supName) + ' | ' +
'';
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 6a895c5..a8cf435 100644
--- a/js/car_demand_plan/child/emerg_internal_car_form.js
+++ b/js/car_demand_plan/child/emerg_internal_car_form.js
@@ -425,15 +425,15 @@ function goOnAddData() {
if (parseInt(id) === parseInt(item.id)) {
let times = $(this).find('td').eq(7).find('input[name="times"]').val(),
needNum = $(this).find('td').eq(6).find('input[name="needNum"]').val(),
- remark = $(this).find('td').eq(8).find('input[name="remarks"]').val();
- if (!item.times || item.times === 0) {
+ remarks = $(this).find('td').eq(8).find('input[name="remarks"]').val();
+ if (!item.times || parseInt(item.times) === 0) {
item.times = times;
}
- if (!item.needNum || item.needNum === 0) {
+ if (!item.needNum || parseInt(item.needNum) === 0) {
item.needNum = needNum;
}
- if (!item.needNum || item.remark === 0) {
- item.remark = remark;
+ if (!item.remarks) {
+ item.remarks = remarks;
}
}
})
diff --git a/js/car_settlement/child/branch_dispatch_car_detail.js b/js/car_settlement/child/branch_dispatch_car_detail.js
index e53b204..e8bf137 100644
--- a/js/car_settlement/child/branch_dispatch_car_detail.js
+++ b/js/car_settlement/child/branch_dispatch_car_detail.js
@@ -269,7 +269,7 @@ function getDispatchCarData(id) {
'' + item.useAddress + ' | ' +
'' + item.planDay + ' | ' +
'' + setZlPrice(item) + ' | ' +
- ' ¥ ' + item.dcMoney + ' | ' +
+ ' ¥ ' + item.cost + ' | ' +
"" + imgNum + "查看附件>> | " +
'' + objParam.supName + ' | ' +
'';
diff --git a/js/car_settlement/child/settlement_detail.js b/js/car_settlement/child/settlement_detail.js
index a517863..dba40f8 100644
--- a/js/car_settlement/child/settlement_detail.js
+++ b/js/car_settlement/child/settlement_detail.js
@@ -169,7 +169,7 @@ function getPayCarDetails() {
'' + item.useAddress + ' | ' +
'' + item.planDay + ' | ' +
'' + setZlPrice(item) + ' | ' +
- ' ¥ ' + item.dcMoney + ' | ' +
+ ' ¥ ' + item.cost + ' | ' +
"" + imgNum + "查看附件>> | " +
"" + item.planCode + " | " +
'';