From 00929a147aa125a617f5ec28597bf355356f65f8 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 24 三月 2026 10:35:54 +0800
Subject: [PATCH] #约旦数据库
---
src/main/webapp/views/order/order.html | 223 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 161 insertions(+), 62 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 736659d..93404b4 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -50,12 +50,12 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline mr0">
- <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
+ <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿" data-i18n-placeholder="input_order_no"/>
</div>
</div>
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ <input class="layui-input layui-laydate-range" id="modi_time" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px" data-i18n-placeholder="start_end_time">
</div>
</div>
<div class="layui-inline">
@@ -67,19 +67,22 @@
<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>
+ <option value="" data-i18n="select_status">閫夋嫨鐘舵��</option>
+ <option value="1" data-i18n="settle_1">寰呭鐞�</option>
+ <option value="2" data-i18n="settle_2">浣滀笟涓�</option>
+ <option value="4" data-i18n="settle_4">宸插畬鎴�</option>
+ <option value="6" data-i18n="settle_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>鎼滅储
+ <i class="layui-icon"></i><span data-i18n="search">鎼滅储</span>
</button>
- <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i>娣诲姞
+ <button id="createInspectionBtn" class="layui-btn icon-btn btn-add" type="button">
+ <i class="layui-icon"></i><span data-i18n="create_inspection_order">鍒涘缓妫�楠屽崟</span>
+ </button>
+ <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon"></i><span data-i18n="add">娣诲姞</span>
</button>
</div>
</div>
@@ -89,26 +92,28 @@
</div>
<div class="layui-card">
<div class="layui-card-body">
- 鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��
- <span class="text-danger">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
+ <span data-i18n="order_intro">鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��</span>
+ <span class="text-danger" data-i18n="order_intro_warning">鎵嬪姩娣诲姞鏃讹紝璇锋鏌ュ崟鎹紪鍙锋槸鍚﹀湪ERP绯荤粺涓凡瀛樺湪锛岄伩鍏嶅彂鐢熸暟鎹敊璇棶棰樸��</span>
</div>
</div>
</div>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
- {{# 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>
+ {{# if ((d.settle == 0 || d.settle == 1) && d.docType !=9) { }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">{{ I18n.t('modify') }}</a>
+ {{# } }}
+ {{# if (d.settle == 0 || d.settle == 1 ) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">{{ I18n.t('delete') }}</a>
{{# } }}
{{# if (d.settle == 2) { }}
- <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">{{ I18n.t('complete') }}</a>
{{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
<span class="layui-text">
<a href="javascript:;" lay-event="look">
- <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍗曟嵁鏄庣粏
+ <i class="layui-icon" style="font-size: 12px;"></i> <span data-i18n="view_order_detail">鏌ョ湅鍗曟嵁鏄庣粏</span>
</a>
</span>
</script>
@@ -117,7 +122,7 @@
{{# 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>
+ <i class="layui-icon layui-icon-about wrk-trace" lay-tips="{{ I18n.t('wrk_trace') }}" lay-direction="2" lay-offset="-10px,0px" lay-event="wrkTrace"></i>
</script>
<!--<script type="text/html" id="settleTpl">-->
@@ -138,17 +143,17 @@
{{# }else if(d.settle === 6){ }}
class="layui-badge layui-badge-gray"
{{# } }}
- >{{d.settle$}}</span>
+ >{{ typeof I18n !== 'undefined' ? I18n.t('settle_' + d.settle) : d.settle$ }}</span>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
<form id="editForm" lay-filter="editForm" class="layui-form model-form">
<input name="id" type="hidden"/>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁绫诲瀷锛�</label>
+ <label class="layui-form-label" data-i18n="doc_type">鍗曟嵁绫诲瀷锛�</label>
<div class="layui-input-block cool-auto-complete">
<input class="layui-input" name="docType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" style="display: none">
- <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+ <input id="docType$" name="docType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ュ崟鎹被鍨�" onfocus=this.blur() lay-verType="tips" data-i18n-placeholder="please_input">
<div class="cool-auto-complete-window">
<input class="cool-auto-complete-window-input" data-key="docTypeQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
<select class="cool-auto-complete-window-select" data-key="docTypeQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
@@ -157,49 +162,138 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
+ <label class="layui-form-label" data-i18n="order_no">鍗曟嵁缂栧彿锛�</label>
<div class="layui-input-block">
- <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+ <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" data-i18n-placeholder="input_order_no"/>
<!-- lay-verify="required"-->
</div>
</div>
<div class="layui-form-item" style="position: relative;">
- <label class="layui-form-label">鍗曟嵁鏄庣粏锛�</label>
+ <label class="layui-form-label" data-i18n="order_detail">鍗曟嵁鏄庣粏锛�</label>
<div class="layui-input-block">
<table id="formSSXMTable" lay-filter="formSSXMTable"></table>
</div>
<button class="layui-btn layui-btn-sm icon-btn" id="matAddBtnComment"
style="position: absolute; left: 20px;top: 60px;padding: 0 5px;" type="button">
- <i class="layui-icon"></i>娣诲姞鏄庣粏
+ <i class="layui-icon"></i><span data-i18n="add_detail">娣诲姞鏄庣粏</span>
</button>
</div>
<div class="layui-form-item text-right">
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit>淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="orderEditSubmit" lay-submit data-i18n="save">淇濆瓨</button>
</div>
</form>
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="formSSXMTableBar">
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>-->
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">{{ I18n.t('delete') }}</a>
</script>
<!-- 琛ㄥ崟寮圭獥 -->
<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" style="float: left">
- <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
+ <label class="layui-form-label" data-i18n="mat_multi_select">鐗╂枡 - 澶氶��</label>
<div class="layui-input-block">
<div id="mat" name="mat">
</div>
</div>
</div>
<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>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
+ <button class="layui-btn" lay-filter="matEditSubmit" lay-submit data-i18n="save">淇濆瓨</button>
</div>
</form>
+</script>
+<!-- 妫�楠屽崟鍒涘缓寮圭獥 -->
+<script type="text/html" id="inspectionDialog">
+ <div class="layui-form model-form" style="padding: 15px;">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 110px;" data-i18n="po_number">PO Number</label>
+ <div class="layui-input-inline" style="width: 200px;">
+ <input name="poNumber" class="layui-input" type="text" placeholder="PO Number" data-i18n-placeholder="po_number_placeholder">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;" data-i18n="style">Style</label>
+ <div class="layui-input-inline" style="width: 160px;">
+ <input name="style" class="layui-input" type="text" placeholder="Style" data-i18n-placeholder="style_placeholder">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 80px;" data-i18n="color">Color</label>
+ <div class="layui-input-inline" style="width: 160px;">
+ <input name="color" class="layui-input" type="text" placeholder="Color" data-i18n-placeholder="color_placeholder">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 120px;" data-i18n="carton_from">Carton From</label>
+ <div class="layui-input-inline" style="width: 120px;">
+ <input name="cartonNumberFrom" class="layui-input" type="number" placeholder="From" data-i18n-placeholder="carton_from_placeholder">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 1px;" data-i18n="to">To</label>
+ <div class="layui-input-inline" style="width: 120px;">
+ <input name="cartonNumberTo" class="layui-input" type="number" placeholder="To" data-i18n-placeholder="carton_to_placeholder">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <button class="layui-btn" lay-filter="inspectionSearch" lay-submit><span data-i18n="search">鎼滅储</span></button>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <fieldset class="layui-elem-field">
+ <legend data-i18n="po_summary" style="font-size: 18px; font-weight: inherit;">Po Summary</legend>
+ <div class="layui-field-box">
+ <div class="layui-row layui-col-space10">
+ <div class="layui-col-md2">
+ <span data-i18n="buyer_po">Buyer PO</span>锛�
+ <span id="poSummaryBuyerPo"></span>
+ </div>
+ <div class="layui-col-md2">
+ <span data-i18n="total_styles">Total Styles</span>锛�
+ <span id="poSummaryTotalStyles"></span>
+ </div>
+ <div class="layui-col-md2">
+ <span data-i18n="total_colors">Total Colors</span>锛�
+ <span id="poSummaryTotalColors"></span>
+ </div>
+ <div class="layui-col-md2">
+ <span data-i18n="total_cartons">Total Cartons</span>锛�
+ <span id="poSummaryTotalCartons"></span>
+ </div>
+ <div class="layui-col-md2">
+ <span data-i18n="total_quantity">Total Quantity</span>锛�
+ <span id="poSummaryTotalQty"></span>
+ </div>
+ </div>
+ </div>
+ </fieldset>
+ </div>
+ <div class="layui-form-item">
+ <fieldset class="layui-elem-field">
+ <legend data-i18n="matching_locations" style="font-size: 18px; font-weight: inherit;">Matching Locations</legend>
+ <div class="layui-field-box">
+ <table id="matchingLocationsTable" lay-filter="matchingLocationsTable"></table>
+ </div>
+ </fieldset>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 140px;" data-i18n="buyer_short_code">Buyer short code</label>
+ <div class="layui-input-inline" style="width: 180px;">
+ <input name="buyerShortCode" class="layui-input" type="text" placeholder="Buyer short code" data-i18n-placeholder="buyer_short_code_placeholder">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item text-right">
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog" data-i18n="cancel">鍙栨秷</button>
+ <button class="layui-btn" type="button" id="inspectionCreateBtn"><span data-i18n="create_inspection_order">鍒涘缓妫�楠屽崟</span></button>
+ </div>
+ </div>
</script>
<!-- 璁㈠崟浠诲姟杩芥函 -->
<script id="wrkTraceDialog" type="text/html" style="position: relative">
@@ -228,26 +322,26 @@
{{# if(item.wrkMast.ioType < 100){ }}
<span class="layui-badge layui-bg-blue" style="line-height: 20px;">
- {{ item.wrkMast.ioType$ }}
+ {{ I18n.t('io_type_' + item.wrkMast.ioType) }}
</span>
{{# } }}
{{# if(item.wrkMast.ioType > 100){ }}
<span class="layui-badge layui-bg-orange" style="line-height: 20px;">
- {{ item.wrkMast.ioType$ }}
+ {{ I18n.t('io_type_' + item.wrkMast.ioType) }}
</span>
{{# } }}
{{# if(item.wrkMast.wrkSts < 14){ }}
<span class="layui-badge layui-bg-red" style="line-height: 20px;">
- {{ item.wrkMast.wrkSts$ }}
+ {{ I18n.t('wrk_status_' + item.wrkMast.wrkSts) }}
</span>
{{# } }}
{{# if(item.wrkMast.wrkSts >= 14){ }}
<span class="layui-badge layui-bg-green" style="line-height: 20px;">
- {{ item.wrkMast.wrkSts$ }}
+ {{ I18n.t('wrk_status_' + item.wrkMast.wrkSts) }}
</span>
{{# } }}
@@ -255,23 +349,31 @@
{{ item.wrkMast.ioTime$ }}
</div>
- <table class="layui-table" lay-skin="nob" style="width: 100%">
- <thead>
- <tr style="background: none">
- <td>No.</td>
- <td>鍟嗗搧缂栧彿</td>
-<!-- <td>瑙勬牸</td>-->
- <td>鏁伴噺</td>
- <td>鏉＄爜</td>
- </tr>
- </thead>
+ <table class="layui-table" lay-skin="nob" style="width: 80%">
<tbody>
{{# layui.each(item.wrkDetls, function(idx, wrkDetl){ }}
- <tr>
- <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
+ <tr style="background: none">
+ <td>{{ I18n.t('serial_number') }}</td>
+ <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
+ </tr>
+ <tr style="background: none">
+ <td>{{ I18n.t('mat_code_label') }}</td>
<td>{{ wrkDetl.matnr }}</td>
-<!-- <td>{{ wrkDetl.specs }}</td>-->
+ </tr>
+ <tr style="background: none">
+ <td>{{ I18n.t('mat_name_label') }}</td>
+ <td>{{ wrkDetl.maktx }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>{{ I18n.t('spec_label') }}</td>
+ <td>{{ wrkDetl.specs }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>{{ I18n.t('qty_label') }}</td>
<td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
+ </tr>
+ <tr style="background: none">
+ <td>{{ I18n.t('barcode_label') }}</td>
<td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
</tr>
{{# }); }}
@@ -285,29 +387,26 @@
</ul>
{{# } else { }}
<div style="height: 350px;display: flex;justify-content: center;align-items: center;">
- <h2 style="font-weight: bold;letter-spacing: 2px">鏆傛棤浠诲姟</h2>
+ <h2 style="font-weight: bold;letter-spacing: 2px" data-i18n="no_task">鏆傛棤浠诲姟</h2>
</div>
{{# } }}
</div>
</div>
-
-
</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/order/order.js" charset="utf-8"></script>
-<script type="text/template" id="docTypeTpl">
- <option value="">閫夋嫨绫诲瀷</option>
+<script type="text/html" id="docTypeTpl">
+ <option value="" data-i18n="please_select_type">璇烽�夋嫨绫诲瀷</option>
{{#each records}}
- <option value="{{docId}}">{{docName}}</option>
+ <option value="{{docId}}">{{transDocName}}</option>
{{/each}}
</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js"></script>
+<script type="text/javascript" src="../../static/js/common.js"></script>
+<script type="text/javascript" src="../../static/js/cool.js"></script>
+<script type="text/javascript" src="../../static/js/i18n/i18n-helper.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/order/order.js"></script>
</body>
-
</html>
-
--
Gitblit v1.9.1