From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期四, 20 二月 2025 09:40:03 +0800 Subject: [PATCH] # --- src/main/webapp/views/order/order.html | 254 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 240 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html index 41ed176..aa5fc84 100644 --- a/src/main/webapp/views/order/order.html +++ b/src/main/webapp/views/order/order.html @@ -8,12 +8,37 @@ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> - <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/originTable.css" media="all"> <!-- <link rel="stylesheet" href="../../static/css/common.css" media="all">--> <!--[if lt IE 9]> <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> + <style> + .wrk-trace { + color: green; + cursor: pointer; + margin-left: 6px; + font-size: 18px; + } + + .layui-timeline:first-child .layui-timeline-item { + margin-top: 30px; + } + .btn-add { + display: none; + } + .btn-edit { + display: none; + } + .btn-complete { + display: none; + } + .btn-delete { + display: none; + } + </style> </head> <body> @@ -35,11 +60,28 @@ </div> </div> <div class="layui-inline"> + <div class="layui-input-inline"> + <select name="doc_type" id="docType-query"> + </select> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <select name="settle"> + <option value="">閫夋嫨鐘舵��</option> + <option value="1">寰呭鐞�</option> + <option value="2">浣滀笟涓�</option> + <option value="4">宸插畬鎴�</option> + <option value="6">涓婃姤瀹屾垚</option> + </select> + </div> + </div> + <div class="layui-inline"> <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit> <i class="layui-icon"></i>鎼滅储 </button> - <button id="orderAddBtn" class="layui-btn icon-btn"><i class="layui-icon"></i>娣诲姞 - </button> +<!-- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞--> +<!-- </button>--> </div> </div> </div> @@ -48,20 +90,52 @@ </div> <div class="layui-card"> <div class="layui-card-body"> - 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥�� - <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span> +<!-- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��--> +<!-- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>--> + <span class="text-danger">鍑哄簱鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span> + </div> + </div> +</div> + +<div id="myModal" style="display: none"> + <div style="padding: 10px"> + <div class="layui-upload"> + <button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">閫夋嫨鏂囦欢</button><input id="data-btn-upload" class="layui-upload-file" type="file" accept="" name="file" multiple=""> + <div class="layui-upload-list" style="max-width: 1000px;height:400px;overflow: scroll"> + <table class="layui-table"> + <colgroup> + <col> + <col width="150"> + <col width="260"> + <col width="150"> + </colgroup> + <thead> + <tr><th>鏂囦欢鍚�</th> + <th>澶у皬</th> + <th>涓婁紶杩涘害</th> + <th>鎿嶄綔</th> + </tr></thead> + <tbody id="data-btn-file3"></tbody> + </table> + </div> + <button type="button" class="layui-btn" id="testListAction">寮�濮嬩笂浼�</button> </div> </div> </div> <!-- 琛ㄦ牸鎿嶄綔鍒� --> <script type="text/html" id="operate"> - {{# if (d.settle == 1 || d.settle == 2) { }} - <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a> - {{# if (d.settle == 2) { }} - <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs" lay-event="complete">瀹岀粨</a> - {{# } }} + {{# if (d.settle == 0 || d.settle == 1) { }} +<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>--> + <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a> + <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a> {{# } }} - <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a> + {{# if (d.settle == 2) { }} + <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a> + <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a> + {{# } }} + {{# if (d.settle == 4 && d.tkType=='1') { }} + <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="refundLoc">閫�搴�</a> + {{# } }} </script> <!-- 琛ㄦ牸鎿嶄綔鍒� --> <script type="text/html" id="tbLook"> @@ -71,6 +145,14 @@ </a> </span> </script> +<script type="text/html" id="orderNoTpl"> + {{d.orderNo}} + {{# if(d.settle > 1 && d.settle !== 3){ }} + + {{# } }} + <i class="layui-icon layui-icon-about wrk-trace" lay-tips="鏌ョ湅浠诲姟杩芥函" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i> +</script> + <!--<script type="text/html" id="settleTpl">--> <!-- <span name="settle" class="layui-badge layui-badge-gray">{{d.settle$}}</span>--> <!--</script>--> @@ -110,7 +192,8 @@ <div class="layui-form-item"> <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label> <div class="layui-input-block"> - <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/> + <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" /> +<!-- lay-verify="required"--> </div> </div> <div class="layui-form-item" style="position: relative;"> @@ -138,25 +221,168 @@ <script type="text/html" id="matEditDialog"> <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form"> <input name="experimentId" type="hidden"/> - <div class="layui-form-item"> + <div class="layui-form-item" style="float: left"> <label class="layui-form-label">鐗╂枡 - 澶氶��</label> <div class="layui-input-block"> <div id="mat" name="mat"> </div> </div> </div> - <div class="layui-form-item text-right"> + <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px"> <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button> </div> </form> </script> +<!-- 璁㈠崟浠诲姟杩芥函 --> +<script id="wrkTraceDialog" type="text/html" style="position: relative"> + <div style="position: absolute; top: 0; left: 0;"> + <div class="layui-card" style="overflow: hidden;"> + <div class="layui-card-header" style="text-align: center;width: 80%;font-weight: inherit;font-size: 18px">{{ d.orderNo }}</div> + <div class="layui-card-body"> + <div id="wrkTraceCharts" style="height: 300px;width: 400px;transform: translateX(-10%);"></div> + </div> + </div> + </div> + <div class="layui-row" > + <div class="layui-col-md5"> + <h1 style="opacity: 0;">Hello World</h1> + </div> + <div class="layui-col-md7" style=""> + {{# if(d.list.length > 0){ }} + <ul class="layui-timeline" style="height: 400px; overflow: scroll;"> + {{# layui.each(d.list, function(index, item){ }} + <li class="layui-timeline-item"> + <i class="layui-icon layui-timeline-axis"></i> + <div class="layui-timeline-content layui-text"> + <div class="layui-timeline-title"> + <h3 class="inline-block"> + {{ item.wrkNo }} + {{# if(item.wrkMast.ioType < 100){ }} + <span class="layui-badge layui-bg-blue" style="line-height: 20px;"> + {{ item.wrkMast.ioType$ }} + </span> + {{# } }} + + {{# if(item.wrkMast.ioType > 100){ }} + <span class="layui-badge layui-bg-orange" style="line-height: 20px;"> + {{ item.wrkMast.ioType$ }} + </span> + {{# } }} + + + {{# if(item.wrkMast.wrkSts < 14){ }} + <span class="layui-badge layui-bg-red" style="line-height: 20px;"> + {{ item.wrkMast.wrkSts$ }} + </span> + {{# } }} + + {{# if(item.wrkMast.wrkSts >= 14){ }} + <span class="layui-badge layui-bg-green" style="line-height: 20px;"> + {{ item.wrkMast.wrkSts$ }} + </span> + {{# } }} + + </h3>  + {{ item.wrkMast.ioTime$ }} + </div> + + <table class="layui-table" lay-skin="nob" style="width: 80%"> + <thead> + <tr style="background: none"> + <td>No.</td> + <td>瑙勬牸</td> + <!-- <td>瑙勬牸</td>--> + <td>绠卞彿</td> +<!-- <td>绠卞瓙绫诲瀷</td>--> + <td>鏄惁纭</td> + </tr> + </thead> + <tbody> + {{# layui.each(item.wrkDetls, function(idx, wrkDetl){ }} + <tr> + <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td> + <td>{{ wrkDetl.matnr }}</td> + <!-- <td>{{ wrkDetl.specs }}</td>--> + <td style="font-weight: bold">{{ wrkDetl.batch }}</td> + <td style="font-weight: bold">{{ wrkDetl.source$ }}</td> + </tr> + {{# }); }} + </tbody> + </table> + + <hr class="layui-border-cyan" style="width: 90%; opacity: .6;"> + </div> + </li> + {{# }); }} + </ul> + {{# } else { }} + <div style="height: 350px;display: flex;justify-content: center;align-items: center;"> + <h2 style="font-weight: bold;letter-spacing: 2px">鏆傛棤浠诲姟</h2> + </div> + {{# } }} + </div> + </div> + + +</script> + +<!-- 鍑哄簱棰勮 --> +<script type="text/html" id="pakoutPreviewBox" 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> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 10px"> + <table id="stoPreTab" lay-filter="stoPreTab"></table> + </div> + <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem"> + 鎵归噺淇敼 + </button> + </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/html" id="locNoTpl"> + <span name="locNo" + {{# if( d.lack === false){ }} + class="layui-badge layui-badge-green" >{{d.locNo}}</span> + {{# } else { }} + class="layui-badge layui-badge-red" >搴撳瓨涓嶈冻</span> + {{# } }} +</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> +<script type="text/javascript" src="../../static/js/echarts/echarts.min.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/orderTable.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/order/order.js" charset="utf-8"></script> + +<script type="text/template" id="docTypeTpl"> + <option value="">閫夋嫨绫诲瀷</option> + {{#each records}} + <option value="{{docId}}">{{docName}}</option> + {{/each}} +</script> </body> + + +<script type="text/template" id="batchStaSelectTpl"> + <option value="">閫夋嫨鍑哄簱绔�</option> + {{#each list}} + <option value="{{this}}">{{this}}</option> + {{/each}} +</script> + </html> -- Gitblit v1.9.1