From d8f5476af7490d3faf40a7da332155cf06aec5e1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 18:03:16 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 08e3988..0a1a8f4 100644
--- a/src/main/webapp/views/custOrder/custOrder.html
+++ b/src/main/webapp/views/custOrder/custOrder.html
@@ -9,6 +9,14 @@
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/common.css" media="all">
+ <style>
+ .layui-table-cell {
+ height:auto;
+ overflow:visible;
+ text-overflow:inherit;
+ white-space:normal;
+ }
+ </style>
</head>
<body>
@@ -29,8 +37,9 @@
<select name="status">
<option value="" style="display: none">閫夋嫨鐘舵��</option>
<option value="1">寰呭鐞�</option>
- <option value="2">宸插畬鎴�</option>
+ <option value="2">鏈嫞璐�</option>
<option value="3">鍙栨秷</option>
+ <option value="4">宸插畬鎴�</option>
</select>
</div>
</div>
@@ -47,7 +56,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn" onclick="right()" style="background-color: #2F4056">鑷畾涔夐攢鍞崟</button>
+ <button class="layui-btn" onclick="right()" style="background-color: #2F4056">鏂板閲囪喘閫�璐у崟</button>
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
@@ -56,10 +65,10 @@
<script type="text/html" id="operate">
{{#if (d.status == 1){ }}
- <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷ｈ揣</a>
+ <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px"><span style="display: none">{{d.number}}</span>鎷ｈ揣鍗�</a>
{{# } }}
- {{#if (d.status == 2){ }}
- <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
+ {{#if (d.status == 2 || d.status == 4){ }}
+ <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px"><span style="display: none">{{d.number}}</span>鎵撳嵃</a>
{{# } }}
</script>
@@ -68,11 +77,24 @@
{{# if( d.status === 1){ }}
class="layui-badge layui-badge-blue"
{{# } else if(d.status === 2){ }}
- class="layui-badge layui-badge-green"
- {{# } else if(d.status === 3){ }}
class="layui-badge layui-badge-red"
+ {{# } else if(d.status === 3){ }}
+ class="layui-badge layui-badge-gray"
+ {{# } else if(d.status === 4){ }}
+ class="layui-badge layui-badge-green"
{{# } }}
>{{d.status$}}</span>
+</script>
+
+<script type="text/html" id="typeTpl">
+ <span name="type"
+ {{# if( d.type === 1){ }}
+ class="layui-badge layui-badge-blue" ><span style="display: none">{{d.number}}</span>骞充粨</span>
+ {{# } else if(d.type === 2){ }}
+ class="layui-badge layui-badge-green" ><span style="display: none">{{d.number}}</span>绔嬪簱</span>
+ {{# } else if(d.type === 0){ }}
+ class="layui-badge layui-badge-red" ><span style="display: none">{{d.number}}</span>缂鸿揣</span>
+ {{# } }}
</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
@@ -84,7 +106,15 @@
<script type="text/javascript" src="../../static/js/custOrder/custOrder.js" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
+<!-- 鎵撳嵃瀹瑰櫒 -->
<div id="pakoutPrintBox" style="display: none"></div>
+<!-- 鍑哄簱棰勮瀹瑰櫒 -->
+<div id="stoukOutPreview" style="display: none">
+ <div style="padding: 25px; line-height: 22px; background-color: #393D49; color: #fff; font-weight: 300;">
+ <span style="font-size: large; font-weight: bold">鎷ｈ揣鍗曢瑙�</span>
+ </div>
+ <table id="stoPreTab" lay-filter="stoPreTab"></table>
+</div>
</body>
--
Gitblit v1.9.1