From e701bbb0b83037cb945cdd66d7f943b68c88f004 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期四, 07 三月 2024 12:56:37 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/SOSetting/ExportAllot.html | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index f0c753f..3e3fd25 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -23,11 +23,11 @@
<link rel="stylesheet" href="../../css/public.css" media="all">
</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">
+ <div class="layui-form layui-card-header layuiadmin-card-header-auto" id="top">
<div class="layui-form-item">
<div class="layui-inline">
@@ -120,10 +120,13 @@
<div class="layui-card-body">
<div>
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
- <ul class="layui-tab-title">
+ <ul class="layui-tab-title" id="tab">
<li class="layui-this">鎵樼洏淇℃伅</li>
<li>绠辩爜淇℃伅</li>
</ul>
+
+ <div id="center"></div>
+
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
@@ -214,6 +217,22 @@
}}
{{ GetBtn7(d) }}
</script>
+
+ <script type="text/html" id="templetUnstackingMode">
+ {{# function GetBtn8(d){
+ switch (d.UnstackingMode) {
+ case "0":
+ return "鏈哄櫒浜烘媶鍨�";
+ case "1":
+ return "浜哄伐鎷嗗灈";
+ default:
+ return "";
+ }
+ }
+ }}
+ {{ GetBtn8(d) }}
+ </script>
+
<!-- #endregion -->
</div>
</div>
@@ -288,6 +307,8 @@
layer = layui.layer,
laydate = layui.laydate;
var $ = layui.$;
+ var h1 = GetTableTabHeight();
+
// var h1 = GetTableTopHeight();
// var h2 = GetTableBottomHeight();
// laydate.render({
@@ -315,7 +336,9 @@
{field: 'Status',align: 'center',title: '鐘舵��',width: 90,templet: '#templetStatus'},
{field: 'Qty',title: '鍑哄簱鏁伴噺',align: 'center',width: 90,},
{field: 'CompleteQty',title: '鎷ｈ揣鏁伴噺',align: 'center',width: 90},
+ {field: 'UnstackingMode',title: '鎷嗗灈鏂瑰紡',align: 'center',width: 90,templet: '#templetUnstackingMode'},
{field: 'OutMode',title: '鍑哄簱鍙�',align: 'center',width: 90,templet: '#outType',},
+ {field: 'LoadingAddre',title: '瑁呰溅鍙�',align: 'center',width: 90,templet: '#outType',},
{field: 'IsAdvance',title: '鎷ｈ揣绫诲瀷',align: 'center',width: 90,templet: '#templetIsAdvance'},
{field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 110},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 150},
@@ -547,7 +570,7 @@
elem: '#LAY-app-content-list',
url: IP + "/BllSo/GetExportAllotList",
method: 'POST',
- height: 'full-210',
+ height: h1,
id: 'LAY-app-content-list',
where: param,
contentType: 'application/json',
@@ -726,7 +749,7 @@
elem: '#LAY-app-content-list2',
url: IP + "/BllSo/GetCompleteDetailList",
method: 'POST',
- height: 'full-206',
+ height: h1,
id: 'LAY-app-content-list2',
where: param,
contentType: 'application/json',
--
Gitblit v1.8.0