From 01ddb1af76628e12e5e26a7dec0e40fcd196dc3c Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 11 Nov 2024 11:23:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/demandPlan/apply_plan_detail.css          |  37 +++++-
 .../child/excess_inventory_source.js          |  74 ++++++------
 page/demandPlan/child/apply_plan_detail.html  | 105 +++++++++---------
 .../child/excess_inventory_source.html        |   8 +-
 4 files changed, 130 insertions(+), 94 deletions(-)

diff --git a/css/demandPlan/apply_plan_detail.css b/css/demandPlan/apply_plan_detail.css
index 0b9933f..f7ecc03 100644
--- a/css/demandPlan/apply_plan_detail.css
+++ b/css/demandPlan/apply_plan_detail.css
@@ -4,11 +4,30 @@
 	align-items: center;
 }
 
+body {
+	margin: 0 15px 15px 15px;
+}
+
 #main-box {
 	width: 100%;
 	height: 100%;
 	padding: 0 2% 0 2%;
 	box-sizing: border-box;
+	background-color: #fff;
+	border-radius: 5px;
+}
+
+.title {
+	width: 100%;
+	height: 30px;
+	justify-content: start;
+	box-sizing: border-box;
+}
+
+.title p {
+	font-size: 14px !important;
+	font-weight: bold;
+
 }
 
 #plan-detail-box {
@@ -19,8 +38,10 @@
 	justify-content: space-evenly;
 }
 
-#plan-detail-box>p, #plan-basic-box>p, #oper-record-box p,
-	#implement-box p {
+#plan-detail-box>p,
+#plan-basic-box>p,
+#oper-record-box p,
+#implement-box p {
 	font-size: 20px;
 	font-weight: bold;
 }
@@ -42,7 +63,8 @@
 	box-sizing: border-box;
 }
 
-.classTable tr td, .classTable tr th {
+.classTable tr td,
+.classTable tr th {
 	height: 50px;
 	box-sizing: border-box;
 	border: 1px solid #ddd;
@@ -50,11 +72,13 @@
 	text-align: left;
 }
 
-.classTable tr td, .classTable tr th {
+.classTable tr td,
+.classTable tr th {
 	width: 20%
 }
 
-.classTable tr td:nth-child(1), .classTable tr th:nth-child(1) {
+.classTable tr td:nth-child(1),
+.classTable tr th:nth-child(1) {
 	width: 40%
 }
 
@@ -103,6 +127,7 @@
 .user-oper {
 	flex-direction: column;
 }
-.page-content{
+
+.page-content {
 	width: 100%;
 }
\ No newline at end of file
diff --git a/js/demandPlan/child/excess_inventory_source.js b/js/demandPlan/child/excess_inventory_source.js
index ad03922..25d4f3d 100644
--- a/js/demandPlan/child/excess_inventory_source.js
+++ b/js/demandPlan/child/excess_inventory_source.js
@@ -35,6 +35,10 @@ function getDataInfoDetails() {
         $('#name').html(obj.name);
         $('#unit').html(obj.unit);
         $('#module').html(obj.module);
+        $('#wfhNum').html(obj.wfhNum);
+        $('#kuNum').html(obj.kuNum);
+        $('#clNum').html(obj.clNum);
+        $('#proNum').html(obj.proNum);
     }
 }
 
@@ -67,23 +71,16 @@ function initTable() {
         cols: [
             [
                 {
-                    width: '9.8%',
+                    width: '5.8%',
                     title: "序号",
                     align: "center",
                     templet: function (d) {
                         return d.LAY_NUM;
                     },
                 },
-                {
-                    field: "proName",
-                    width: '30%',
-                    title: "工程名称 ",
-                    unresize: true,
-                    align: "center",
-                },
                 {
                     field: "code",
-                    width: '30%',
+                    width: '10%',
                     title: "需求计划编号",
                     unresize: true,
                     align: "center",
@@ -93,34 +90,49 @@ function initTable() {
                         return html;
                     },
                 },
+                {
+                    field: "proName",
+                    width: '15%',
+                    title: "工程名称",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "projectPart",
+                    width: '15%',
+                    title: "项目部分",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "projectContent",
+                    width: '15%',
+                    title: "工程内容 ",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "proName",
+                    width: '15%',
+                    title: "需用日期",
+                    unresize: true,
+                    align: "center",
+                },
+                {
+                    field: "remark",
+                    width: '15%',
+                    title: "计划说明 ",
+                    unresize: true,
+                    align: "center",
+                },
                 {
                     field: "needNum",
-                    width: '10%',
+                    width: '9%',
                     title: "需用量 ",
                     unresize: true,
                     templet: function (d) {
                         return setNumColor(d.needNum, 1);
                     },
-                },
-                {
-                    field: "needNum",
-                    title: "已发货量",
-                    width: '10%',
-                    unresize: true,
-                    align: "center",
-                    templet: function (d) {
-                        return setNumColor(d.needNum, 2);
-                    },
-                },
-                {
-                    field: "needNum",
-                    title: "待发货量",
-                    width: '10%',
-                    unresize: true,
-                    align: "center",
-                    templet: function (d) {
-                        return setNumColor(d.needNum, 3);
-                    },
                 }
             ]
         ],
@@ -150,5 +162,5 @@ function setNumColor(value, type) {
 
 // 需求计划编号
 function demand_plan(obj){
-    openIframeByParamObj2("demand_plan", "机具需求计划", "./excess_inventory_source.html", "92%", "95%", obj);
+    openIframeByParamObj2("demand_plan", "机具需求计划", "./apply_plan_detail.html", "92%", "95%", obj);
 }
\ No newline at end of file
diff --git a/page/demandPlan/child/apply_plan_detail.html b/page/demandPlan/child/apply_plan_detail.html
index 706f886..f1a4a39 100644
--- a/page/demandPlan/child/apply_plan_detail.html
+++ b/page/demandPlan/child/apply_plan_detail.html
@@ -14,7 +14,7 @@
 		<div id="plan-detail-box" class="layout">
 			<div class="layout" style="width: 100%;justify-content: space-between;">
 				<p style="font-size: 20px;font-weight: bold;">机具需求计划</p>
-				<button type="button" class="layui-btn" onclick="print()">打印</button>
+				<button type="button" class="layui-btn layui-bg-blue" onclick="print()">打印</button>
 			</div>
 			<div class="layout">
 				<p id="code"></p>
@@ -25,7 +25,10 @@
 		</div>
 		<!--基本信息-->
 		<div id="plan-basic-box" class="layout">
-			<p>基本信息</p>
+			<div class="title layout">
+                <span style="font-weight:700;text-decoration:none;color:#409EFF;">▋</span>
+                <p>基本信息</p>
+            </div>
 			<div id="plan-basic-table">
 				<table class="classTable">
 					<tr>
@@ -51,63 +54,59 @@
 		</div>
 		<!--机具明细-->
 		<div id="implement-box" class="layout">
-			<p>机具明细</p>
+			<div class="title layout">
+                <span style="font-weight:700;text-decoration:none;color:#409EFF;">▋</span>
+                <p>机具明细</p>
+            </div>
 			<div class="page-content">
-				<div class="row-fluid">
-					<div class="col-xs-12">
-						<form id="baseForm" class="form-inline" method="POST"
-							onsubmit="return false;">
-							<div class="row">
-								<div class="widget-main">
-									&emsp;&nbsp;<input type="text" name="keyWord" id="keyWord"
-										placeholder="输入物机名称" class="input-large" maxlength="30">
-										<input type="text" name="keyWord2" id="keyWord2"
-										placeholder="输入规格" class="input-large" maxlength="30">
-									<button id='searchBtn' class="btn btn-warning  btn-sm"
-										title="过滤" type="button" onclick="search()">
-										<i class="icon-search bigger-110 icon-only"></i>
-									</button>
-									<button class="btn btn-sm" title="重置" type="button"
-										onclick="resetSearch()">重置</button>
-									<button class="btn btn-danger btn-sm" title="下载" type="button"
-										onclick="exportData()">下载</button>
-								</div>
+				<form class="layui-form layui-form-pane" action="#" onsubmit="return false;">
+					<div class="layui-form-item">
+						<div class="layui-inline">
+							<div class="layui-input-inline" style="width: 300px;">
+								<input type="text" name="keyWord" id="keyWord" autocomplete="off"
+									class="layui-input" lay-affix="clear" placeholder="输入物机名称" maxlength="30">
 							</div>
-							<input type='hidden' class='pageNum' name='pageNum' value='1' />
-							<input type='hidden' class='pageSize' name='pageSize' value='10' />
-						</form>
-						<table id="baseTable"
-							class="table table-striped table-bordered table-hover">
-							<thead>
-								<tr>
-									<th style="width: 10%" class="center hidden-480">序号</th>
-									<th style="width: 15%" class="center">物机类型</th>
-									<th style="width: 20%" class="center">物机名称</th>
-									<th style="width: 10%" class="center">规格</th>
-									<th style="width: 10%" class="center">单位</th>
-									<th style="width: 10%" class="center">需用量</th>
-									<th style="width: 10%" class="center">需用天数</th>
-									<th style="width: 15%" class="center">备注</th>
-								</tr>
-							</thead>
-							<tbody></tbody>
-						</table>
-						<!-- <div class="row">
-							<div class="col-sm-4"></div>
-							<div class="col-sm-8">
-								设置分页位置
-								<div id="pageing" class="dataTables_paginate paging_bootstrap">
-									<ul class="pagination"></ul>
-								</div>
+						</div>
+						<div class="layui-inline">
+							<div class="layui-input-inline" style="width: 300px;">
+								<input type="text" name="keyWord2" id="keyWord2" autocomplete="off"
+									class="layui-input" lay-affix="clear" placeholder="输入规格" maxlength="30">
 							</div>
-						</div> -->
+						</div>
+						<div class="layui-inline">
+							<button class="layui-btn layui-bg-blue" onclick="search()"><i
+									class="layui-icon"></i> 搜 索</button>
+							<button class="layui-btn layui-btn-primary" onclick="resetSearch()"><i
+									class="layui-icon layui-icon-refresh"></i> 重 置</button>
+							<button class="layui-btn layui-btn-primary" onclick="exportData()"><i
+									class="layui-icon layui-icon-download-circle"></i> 下 载</button>
+						</div>
 					</div>
-				</div>
+				</form>
+				<table id="baseTable"
+					class="classTable table-hover">
+					<thead>
+						<tr>
+							<th style="width: 10%" class="center">序号</th>
+							<th style="width: 15%" class="center">物机类型</th>
+							<th style="width: 20%" class="center">物机名称</th>
+							<th style="width: 10%" class="center">规格</th>
+							<th style="width: 10%" class="center">单位</th>
+							<th style="width: 10%" class="center">需用量</th>
+							<th style="width: 10%" class="center">需用天数</th>
+							<th style="width: 15%" class="center">备注</th>
+						</tr>
+					</thead>
+					<tbody></tbody>
+				</table>
 			</div>
 		</div>
 		<!-- 操作记录 -->
 		<div id="oper-record-box" class="layout">
-			<p>操作记录</p>
+			<div class="title layout">
+                <span style="font-weight:700;text-decoration:none;color:#409EFF;">▋</span>
+                <p>操作记录</p>
+            </div>
 			<div class="layui-timeline">
 				<div class="layui-timeline-item">
 					<i class="layui-icon layui-timeline-axis"></i>
@@ -116,7 +115,7 @@
 						<div class="layui-panel">
 							<div class="oper-info layout">
 								<div class="layout">
-									<img src="${bonuspath}/static/img/user_head_icon.png">
+									<img src="../../../images/user_head_icon.png">
 								</div>
 								<div class="user-oper layout">
 									<div style="width: 100%">
@@ -127,7 +126,7 @@
 									</div>
 								</div>
 								<div class="layout">
-									<img src="${bonuspath}/static/img/time_icon.png"> <span
+									<img src="../../../images/time_icon.png"> <span
 										style="margin: 0 5px 0 5px;">2020-12-23 22:31</span>
 								</div>
 							</div>
diff --git a/page/demandPlan/child/excess_inventory_source.html b/page/demandPlan/child/excess_inventory_source.html
index a7a2cb3..774b9e5 100644
--- a/page/demandPlan/child/excess_inventory_source.html
+++ b/page/demandPlan/child/excess_inventory_source.html
@@ -37,13 +37,13 @@
                     </tr>
                     <tr>
                         <th>未发货量</th>
-                        <td id="type"></td>
+                        <td id="wfhNum"></td>
                         <th>库存量</th>
-                        <td id="type"></td>
+                        <td id="kuNum"></td>
                         <th>差量</th>
-                        <td id="type"></td>
+                        <td id="clNum"></td>
                         <th>工程数量</th>
-                        <td id="type"></td>
+                        <td id="proNum"></td>
                     </tr>
                 </table>
             </div>