From 9d7dda331f3498a95e2e922e9ddae0fa43e83605 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 13:38:06 +0800
Subject: [PATCH] 修改问题

---
 HTML/views/WareHouseSetting/Area.html |   94 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index a177cb2..6208c23 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -17,11 +17,11 @@
 			});
 		  </script>
 	</head>
-	<body>
+	<body id="body">
 
 		<div class="layui-fluid"style="padding-bottom: 0;">
 			<div class="layui-card">
-				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC">
+				<div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
 					<div class="layui-form-item">
 						<div class="layui-inline">
 							<label class="layui-form-label" style="width: 70px;">鎵�灞炰粨搴�</label>
@@ -47,6 +47,8 @@
 									<option value="2">鍘熸枡鍖�</option>
 									<option value="3">鍖呮潗鍖�</option>
 									<option value="4">绌烘墭鍖�</option>
+									<option value="5">鑰楁潗鍖�</option>
+									<option value="6">涓棿鍝佸尯</option>
 								</select>
 							</div>
 						</div>
@@ -66,8 +68,14 @@
 								<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>鎼滅储
 							</button>
 						</div>
+						<div class="layui-inline">
+							<button class="layui-btn layui-btn-sm layuiadmin-btn-list approvalBtn" data-type="add" id="approvalBtn">
+								<i class="layui-icon layuiadmin-button-btn">&#xe654;</i>娣诲姞
+							</button>
+						</div>
 					</div>
 				</div>
+				<div id="center"></div>
 				<div class="layui-card-body">
 					<table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
 					 <script type="text/html" id="buttonTpl">
@@ -104,7 +112,8 @@
 					form = layui.form,
 					laypage = layui.laypage,
 					layer = layui.layer;
-				// var $ = layui.$;
+				var $ = layui.$;
+				var h1 = GetTableHeight();
 				refreshTable("","","","");
 				var tableIns;
 				
@@ -138,7 +147,7 @@
 						elem: '#LAY-app-content-list',
 						url: IP +"/Sys/GetStorageAreaList",
 						method: 'POST',
-						height: 'full-95',
+						height: h1,
 						id: 'LAY-app-content-list',
 						where: param,
 						contentType:'application/json',
@@ -152,6 +161,7 @@
 							$(function() {
 								$(".editClass").hide();
 								$(".onOffClass").hide();
+								$("#approvalBtn").hide();
 							});
 							sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
 								if (res.code == 0) { //鎴愬姛 
@@ -164,6 +174,11 @@
 										if (res.data[k].MenuName == "鍚仠鍖哄煙") {
 											$(function() {
 												$(".onOffClass").show();
+											});
+										}
+										if (res.data[k].MenuName == "娣诲姞鍖哄煙") {
+											$(function() {
+												$("#approvalBtn").show();
 											});
 										}
 									}
@@ -185,13 +200,17 @@
 								field: 'WareHouseName',
 								title: '鎵�灞炰粨搴�',
 								width: 120,
-								align: 'center'
+								align: 'center',
+								templet: function(d) {
+
+									return d.WareHouseNo + '-' + d.WareHouseName;
+								}
 								
 							}, {
 								field: 'AreaNo',
 								title: '鍖哄煙缂栧彿',
 								width: 100,
-								align: 'center'
+								align: 'center',
 								
 							}, {
 								field: 'AreaName',
@@ -270,6 +289,69 @@
 					
 					refreshTable(WareHouseNo,AreaName,Type,Status);
 				});
+
+				var doing = true;
+					active = {
+						//鏂板
+						add: function() {
+							layer.open({
+								type: 2,
+								title: '娣诲姞鍖哄煙淇℃伅',
+								content: 'AreaAddFrom.html',
+								maxmin: true,
+								area: ['530px', '530px'],
+								btn: ['纭畾', '鍙栨秷'],
+								yes: function(index, layero) {
+									var iframeWindow = window['layui-layer-iframe' + index],
+										submitID = 'layuiadmin-app-form-submit',
+										submit = layero.find('iframe').contents().find('#' + submitID);
+									//鐩戝惉鎻愪氦
+									iframeWindow.layui.form.on('submit(' + submitID + ')', function(data) {
+										var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+										console.log(field)
+										//鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+										var param = {
+                                            // AreaNo: field.AreaNo, //鍖哄煙缂栫爜
+                                            AreaName: field.AreaName, //鍖哄煙鍚嶇О
+                                            WareHouseNo: field.WareHouseNo, //鎵�灞炰粨搴�
+                                            Status: field.Status, //鏄惁鍚敤 0
+                                            Priority: parseInt(field.Priority), //浼樺厛绾�
+                                            Temperature: field.Temperature, //鍖哄煙绫诲埆
+                                            Type: field.Type, //瀛樺偍绫诲埆
+										};
+                                        if(doing){
+                                            doing = false;
+                                            sendData(IP + "/sys/InsertStorageArea", param, 'post',function(res) {
+                                                console.log(res);
+                                                if (res.code == 0) { //鎴愬姛
+                                                    layer.msg(res.msg, {
+                                                        icon: 1,
+                                                        time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+                                                    }, function() {
+                                                        layer.close(index); //鍏抽棴寮瑰眰
+                                                        // refreshTable($("#CategoryName").val(),$("#AreaNo").val());
+                                                        doing = true;
+                                                    });
+                                                }
+                                                else
+                                                { //涓嶆垚鍔�
+                                                    layer.msg(res.msg, {
+                                                        icon: 2,
+                                                        time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+                                                    }, function() {doing = true;});
+                                                }
+                                            });
+                                        }
+                                    });
+									submit.trigger('click');
+								}
+							});
+						}
+					};
+				$('.layui-btn.layuiadmin-btn-list').on('click', function() {
+					var type = $(this).data('type');
+					active[type] ? active[type].call(this) : '';
+				});
 				
 				table.on('tool(LAY-app-content-list)', function(obj) {
 					var data = obj.data;

--
Gitblit v1.8.0