From 58ac5e52e81c044c82f89ad45a6a5dca71c37f32 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 14 Nov 2024 10:55:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9B=98=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/init.json | 14 ------------- css/demandPlan/delivery_list.css | 4 ++-- images/svg/u702.svg | 1 + js/demandPlan/child/delivery_detail_list.js | 21 ++++++++++++++++++- .../child/demand_plan_detail_list.js | 2 +- js/demandPlan/delivery_list.js | 2 +- .../child/delivery_detail_list.html | 1 + .../child/demand_plan_detail_list.html | 5 +++-- page/demandPlan/child/send_goods_form.html | 2 ++ 9 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 images/svg/u702.svg diff --git a/api/init.json b/api/init.json index 762bde0..7da5959 100644 --- a/api/init.json +++ b/api/init.json @@ -15,20 +15,6 @@ "href": "", "target": "_self", "child": [ - { - "title": "首页", - "href": "", - "icon": "fa fa-home", - "target": "_self", - "child": [ - { - "title": "首页1", - "href": "page/welcome-1.html", - "icon": "fa fa-tachometer", - "target": "_self" - } - ] - }, { "title": "机具需求计划", "href": "", diff --git a/css/demandPlan/delivery_list.css b/css/demandPlan/delivery_list.css index 04e4a85..86accdf 100644 --- a/css/demandPlan/delivery_list.css +++ b/css/demandPlan/delivery_list.css @@ -1,6 +1,6 @@ .table-box { width: 100%; - height: calc(100% - 330px); + height: calc(100% - 280px); } .layout { @@ -11,7 +11,7 @@ #data-overview { width: 100%; - height: 130px; + height: 80px; justify-content: space-around; } diff --git a/images/svg/u702.svg b/images/svg/u702.svg new file mode 100644 index 0000000..510e7a8 --- /dev/null +++ b/images/svg/u702.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/js/demandPlan/child/delivery_detail_list.js b/js/demandPlan/child/delivery_detail_list.js index 45dba91..b850fb6 100644 --- a/js/demandPlan/child/delivery_detail_list.js +++ b/js/demandPlan/child/delivery_detail_list.js @@ -3,6 +3,7 @@ let objParam; function setParams(obj) { objParam = JSON.parse(obj); $('#proName').html(objParam.proName); + $('#status').html(setStatusColor(objParam.status)); $('#planNum').html(objParam.planNum); setStatusColor(objParam.status); layui.use(["layer", 'element'], function () { @@ -162,4 +163,22 @@ function numToChinese(num) { // 查看需求计划 function openDetail() { openIframeByParamObj("view_plan", "需求计划", "../../../page/demandPlan/child/demand_plan_detail_list.html", "92%", "95%", objParam); -} \ No newline at end of file +} + +// 发货状态颜色 +function setStatusColor(value) { + value = value ? parseInt(value) : 0; + let color = "#409Eff"; + let name = '' + if (value === 0) { + color = "#f56c6c"; + name = '未发货'; + } else if (value === 1) { + color = "#ff9900"; + name = '部分发货' + } else if (value === 2) { + color = "#19be6b"; + name = '全部发货' + } + return '' + name + ""; + } \ No newline at end of file diff --git a/js/demandPlan/child/demand_plan_detail_list.js b/js/demandPlan/child/demand_plan_detail_list.js index 3b9414a..c1647f8 100644 --- a/js/demandPlan/child/demand_plan_detail_list.js +++ b/js/demandPlan/child/demand_plan_detail_list.js @@ -53,7 +53,7 @@ function initTable() { headers: { authorization: sessionStorage.getItem("gz-token"), }, - height: "full-180", + height: "full-200", url: dataUrl + "backstage/planOut/getProPlanListByProId", where: { encryptedData: JSON.stringify({ diff --git a/js/demandPlan/delivery_list.js b/js/demandPlan/delivery_list.js index b9e0c33..9a410be 100644 --- a/js/demandPlan/delivery_list.js +++ b/js/demandPlan/delivery_list.js @@ -109,7 +109,7 @@ function initTable() { headers: { authorization: sessionStorage.getItem("gz-token"), }, - height: "full-350", + height: "full-300", url: dataUrl + "backstage/planOut/getProPlanPage", where: { encryptedData: JSON.stringify({ diff --git a/page/demandPlan/child/delivery_detail_list.html b/page/demandPlan/child/delivery_detail_list.html index 8fd6bf7..f1878c1 100644 --- a/page/demandPlan/child/delivery_detail_list.html +++ b/page/demandPlan/child/delivery_detail_list.html @@ -18,6 +18,7 @@
+

diff --git a/page/demandPlan/child/demand_plan_detail_list.html b/page/demandPlan/child/demand_plan_detail_list.html index 9e53f6e..2abc9ee 100644 --- a/page/demandPlan/child/demand_plan_detail_list.html +++ b/page/demandPlan/child/demand_plan_detail_list.html @@ -24,7 +24,7 @@ .title { width: 100%; - height: 30px; + height: 50px; justify-content: start; padding: 0 0 0 20px; box-sizing: border-box; @@ -37,7 +37,7 @@ } .layuimini-main { - height: calc(100% - 30px); + height: calc(100% - 50px); margin: 10px 10px 10px 10px; } @@ -45,6 +45,7 @@
+

diff --git a/page/demandPlan/child/send_goods_form.html b/page/demandPlan/child/send_goods_form.html index 1cb992e..ce2814a 100644 --- a/page/demandPlan/child/send_goods_form.html +++ b/page/demandPlan/child/send_goods_form.html @@ -16,10 +16,12 @@
+

计划数量：0

+
▋