From ef8496a0e5c732c009e3b6c70a11ebff19c084e2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 06 四月 2021 09:34:00 +0800
Subject: [PATCH] #
---
src/main/webapp/views/custOrder/custOrder.html | 82 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/custOrder/custOrder.html b/src/main/webapp/views/custOrder/custOrder.html
index 7de315f..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>
@@ -19,7 +27,22 @@
<input class="layui-input" type="text" name="number" placeholder="閿�鍞崟鍙�" autocomplete="off">
</div>
</div>
-
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="user_code" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="status">
+ <option value="" style="display: none">閫夋嫨鐘舵��</option>
+ <option value="1">寰呭鐞�</option>
+ <option value="2">鏈嫞璐�</option>
+ <option value="3">鍙栨秷</option>
+ <option value="4">宸插畬鎴�</option>
+ </select>
+ </div>
+ </div>
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
@@ -33,6 +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 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>
@@ -41,11 +65,36 @@
<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>
+
+<script type="text/html" id="statusTpl">
+ <span name="status"
+ {{# if( d.status === 1){ }}
+ class="layui-badge layui-badge-blue"
+ {{# } else if(d.status === 2){ }}
+ 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>
@@ -57,16 +106,24 @@
<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>
<script type="text/template" id="pakoutPrintTpl">
<!-- 澶� -->
- <div id="print-header">
+ <div id="print-header" style="margin: 20px 0">
<div style="text-align: center">
<div style="text-align: center;margin-bottom: 10px">
- <span style="font-family: 瀹嬩綋"> 鎹¤揣鍗� </span>
+ <span style="font-family: 瀹嬩綋"> 鎷ｈ揣鍗� </span>
</div>
<img class="template-code template-qrcode" src="{{data.barcodeUrl}}" style="width: 80%">
@@ -77,25 +134,26 @@
</div>
<div style="margin-top: 10px">
<div style="float: left;width: 50%; text-align: left">
- <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣鏁伴噺锛歿{data.total}}</span>
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣鏁伴噺锛歿{data.total}}</span>
</div>
<div style="float: left; width: 50%; text-align: right">
- <span style="font-size: xx-small;font-family: 瀹嬩綋">鎹¤揣浜猴細{{data.workerName}}</span>
-
+ <span style="font-size: xx-small;font-family: 瀹嬩綋">鎷ｈ揣浜猴細{{data.workerName}}</span>
</div>
+ <div style="clear:both;"></div>
</div>
</div>
<!-- 涓讳綋 -->
- <div style="margin-top: 100px">
+ <div style="margin-top: 10px">
{{#each data.list}}
- <div class="pakout-item" style="padding: 10px 5px 20px 5px;">
+ <div class="pakout-item" style="padding: 10px 5px 10px 5px;border-top: 1px solid #525252">
<div class="item-header" style="margin-top: 10px;font-family: 瀹嬩綋; font-size: x-small">
{{maktx}}
</div>
- <div class="item-content" style="margin-top: 20px">
+ <div class="item-content" style="margin: 10px 0 ">
<div style="float: left;font-family: 瀹嬩綋; font-size: xx-small">{{anfme}}{{unit}}</div>
<div style="float: right;font-family: 瀹嬩綋; font-size: xx-small">璐т綅锛歿{locNo}}</div>
+ <div style="clear: both;"></div>
</div>
</div>
{{/each}}
--
Gitblit v1.9.1