From 2251b926332d671672ebb271bcfa48f508dd6c6e Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 20 Jan 2025 09:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/car_demand_plan/child/dispatch_input_detail.js | 10 +++++-----
 js/welcome/pro_list_detail.js                     | 14 +++++++-------
 page/welcome/pro_list_detail.html                 |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

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('<button type="button" id="updateData" class="layui-btn layui-bg-orange" onclick="updateData(' + value + ',' + type + ')">修改</button>');
             }
@@ -86,7 +86,7 @@ function getAllOutList() {
             // 设置新的滚动位置
             scrollableElement.scrollLeft += delta;
         });
-        if (parseInt(status) === 2) {
+        if (parseInt(status) === 2 && isPage) {
             $('#print').before('<button type="button" id="updateData" class="layui-btn layui-bg-orange" onclick="updateData(' + id + ',' + type + ')">修改</button>');
         }
         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) {
                     "<td>" + item.glsPrice + "</td>" +
                     "<td> ¥ " + (item.glsMoney ? item.glsMoney : 0) + "</td>" +
                     "<td style='color:#409eff'>" + imgNum + "<a style='color:#409eff;margin:0 5px;cursor: pointer;' onclick='viewFileDetail(" + JSON.stringify(item) + ",1)'>查看附件>></a></td>" +
-                    "<td>" + objParam.supName + "</td>" +
+                    "<td>" + (objParam.supName || dataObj.supName) + "</td>" +
                     "</tr>";
             })
         } else {
@@ -286,7 +286,7 @@ function getDispatchCarData(id) {
                     '<td>' + setZlPrice(item) + '</td>' +
                     '<td> ¥ ' + item.dcMoney + '</td>' +
                     "<td style='color:#409eff'>" + imgNum + "<a style='color:#409eff;margin:0 5px;cursor: pointer;' onclick='viewFileDetail(" + JSON.stringify(item) + ",2)'>查看附件>></a></td>" +
-                    '<td>' + objParam.supName + '</td>' +
+                    '<td>' + (objParam.supName || dataObj.supName) + '</td>' +
                     '</tr>';
             })
         } 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(`
              <div class="layui-progress" lay-showpercent="true" lay-filter="demo-filter-progress">
-                 <div class="layui-progress-bar layui-bg-blue" lay-percent="${objParam.process}%"></div>
+                 <div class="layui-progress-bar layui-bg-blue" lay-percent="${obj.progress}%"></div>
              </div>
            `);
         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 @@
             </div>
             <div class="layout num-box">
                 <p>运输车辆数量</p>
-                <p id="dispatchNum">0</p>
+                <p id="carNum">0</p>
             </div>
             <div class="layout num-box">
                 <p>吊车数量</p>
-                <p id="noDispatchNum">0</p>
+                <p id="craneNum">0</p>
             </div>
             <div class="layout num-box">
                 <p>金额</p>
-                <p id="noDispatchNum">0</p>
+                <p id="money">0</p>
             </div>
             <div class="layout progress-box">
                 <p id="progress" style="margin: 0 0 20px 0;">进度</p>