diff --git a/js/car_demand_plan/child/dispatch_input_detail.js b/js/car_demand_plan/child/dispatch_input_detail.js
index 438bbeb..001c06b 100644
--- a/js/car_demand_plan/child/dispatch_input_detail.js
+++ b/js/car_demand_plan/child/dispatch_input_detail.js
@@ -27,7 +27,7 @@ function setParams(params) {
let value = $(this).attr('value');
let status = $(this).attr('status');
let type = $(this).attr('type');
- if (parseInt(status) === 2) {
+ if (parseInt(status) === 2 && isPage) {
$('#updateData').remove();
$('#print').before('');
}
@@ -86,7 +86,7 @@ function getAllOutList() {
// 设置新的滚动位置
scrollableElement.scrollLeft += delta;
});
- if (parseInt(status) === 2) {
+ if (parseInt(status) === 2 && isPage) {
$('#print').before('');
}
checkNowValue = id;
@@ -156,7 +156,7 @@ function getDispatchCarData(id) {
errorFn(xhr, status, error)
}, null);
function setTableData(obj) {
-
+ dataObj = obj;
$('#planCode').html(objParam.code);
$('#manager').html(obj.manager);
$('#outDay').html(obj.outDay);
@@ -257,7 +257,7 @@ function getDispatchCarData(id) {
"
" + item.glsPrice + " | " +
" ¥ " + (item.glsMoney ? item.glsMoney : 0) + " | " +
"" + imgNum + "查看附件>> | " +
- "" + objParam.supName + " | " +
+ "" + (objParam.supName || dataObj.supName) + " | " +
"";
})
} else {
@@ -286,7 +286,7 @@ function getDispatchCarData(id) {
'' + setZlPrice(item) + ' | ' +
' ¥ ' + item.dcMoney + ' | ' +
"" + imgNum + "查看附件>> | " +
- '' + objParam.supName + ' | ' +
+ '' + (objParam.supName || dataObj.supName) + ' | ' +
'';
})
} else {
diff --git a/js/welcome/pro_list_detail.js b/js/welcome/pro_list_detail.js
index 63a6b80..7b1ae76 100644
--- a/js/welcome/pro_list_detail.js
+++ b/js/welcome/pro_list_detail.js
@@ -12,19 +12,19 @@ function setParams(params) {
table = layui.table;
element = layui.element;
layer = layui.layer;
- getProStatisticsDetails();
+ getProPlanDataView();
initTable();
});
}
// 数据概览
-function getProStatisticsDetails() {
+function getProPlanDataView() {
let params = {
encryptedData: JSON.stringify({
- 'proId': objParam.proId
+ proId: objParam.proId
})
};
- let url = dataUrl + 'backstage/dispatchCar/getProStatisticsDetails';
+ let url = dataUrl + 'backstage/homeIndex/getProPlanDataView';
ajaxRequest(url, "POST", params, true, function () {
}, function (result) {
if (result.code === 200) {
@@ -38,12 +38,12 @@ function getProStatisticsDetails() {
function setNum(obj) {
$('.layui-progress').remove();
$('#planNum').html(obj.planNum);
- $('#dispatchNum').html(obj.dispatchNum);
- $('#noDispatchNum').html(obj.noDispatchNum);
+ $('#carNum').html(obj.carNum);
+ $('#craneNum').html(obj.craneNum);
$('.layui-progress').remove();
$("#progress").after(`
`);
element.render();
diff --git a/page/welcome/pro_list_detail.html b/page/welcome/pro_list_detail.html
index 0530ef4..3744b38 100644
--- a/page/welcome/pro_list_detail.html
+++ b/page/welcome/pro_list_detail.html
@@ -30,15 +30,15 @@