From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/webapp/views/checkOrder/checkOrder.html | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/checkOrder/checkOrder.html b/src/main/webapp/views/checkOrder/checkOrder.html
index 498e2f5..a77d406 100644
--- a/src/main/webapp/views/checkOrder/checkOrder.html
+++ b/src/main/webapp/views/checkOrder/checkOrder.html
@@ -37,14 +37,9 @@
.btn-delete {
display: none;
}
- /* 闄愬埗涓嬫媺妗嗗ぇ灏忥紝涓嶈秴鍑鸿〃鏍� */
- .ew-select-fixed select {
- max-width: 100%;
- width: 100%;
- }
- .ew-select-fixed .layui-form-select dl {
- max-height: 200px;
- overflow-y: auto;
+ .layui-table-view .layui-table-cell .layui-select-title .layui-input {
+ height: 28px;
+ line-height: 28px;
}
</style>
</head>
@@ -113,6 +108,13 @@
{{# if (d.settle == 2 || d.settle == 11) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
+ {{# if (d.settle == 12) { }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs layui-border-blue" lay-event="createTask">鐢熸垚浠诲姟</a>
+ {{# } }}
+ {{# if (d.settle == 4) { }}
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="export">瀵煎嚭宸紓鍗�</a>
+ <a class="layui-btn layui-btn-primary layui-btn-xs layui-border" lay-event="createAdjust">鐢熸垚璋冩暣鍗�</a>
+ {{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
@@ -121,6 +123,9 @@
<i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏
</a>
</span>
+</script>
+<script type="text/html" id="orderItem">
+ <table id="itemTable" lay-filter="itemTable"></table>
</script>
<script type="text/html" id="orderNoTpl">
{{d.orderNo}}
@@ -239,6 +244,21 @@
</select>
</div>
</script>
+
+<script type="text/html" id="staBatchSelectDialog">
+ <form class="layui-form" style="padding: 25px 50px 30px 50px;text-align: center">
+ <select id="batchSelectStaBox" name="batchSta" lay-vertype="tips" lay-verify="required" required="">
+ </select>
+ <button style="margin-top: 30px" class="layui-btn" lay-filter="staBatchSelectConfirm" lay-submit="">纭畾</button>
+ </form>
+</script>
+
+<script type="text/template" id="batchStaSelectTpl">
+ <option value="">閫夋嫨鍑哄簱绔�</option>
+ {{#each list}}
+ <option value="{{this}}">{{this}}</option>
+ {{/each}}
+</script>
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
--
Gitblit v1.9.1