|
|
@@ -16,18 +16,25 @@
|
|
|
<div class="box-body">
|
|
|
<#form:form id="searchForm" model="${mesMaterialOrder}" action="${ctx}/erp/mesMaterialOrder/listData" method="post" class="form-inline hide"
|
|
|
data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
|
|
|
- <div class="form-group">
|
|
|
- <label class="control-label">${text('订单编号')}：</label>
|
|
|
- <div class="control-inline">
|
|
|
- <#form:input path="orderId" maxlength="64" class="form-control width-120"/>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
+
|
|
|
<div class="form-group">
|
|
|
<label class="control-label">${text('领料单号')}：</label>
|
|
|
<div class="control-inline">
|
|
|
<#form:input path="requisitionNo" maxlength="64" class="form-control width-120"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <div class="form-group">
|
|
|
+ <label class="control-label">${text('生产订单号')}：</label>
|
|
|
+ <div class="control-inline">
|
|
|
+ <#form:input path="orderId" maxlength="64" class="form-control width-120"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="form-group">
|
|
|
+ <label class="control-label">${text('产线')}：</label>
|
|
|
+ <div class="control-inline">
|
|
|
+ <#form:input path="lineSn" maxlength="64" class="form-control width-120"/>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="form-group">
|
|
|
<label class="control-label">${text('更新时间')}：</label>
|
|
|
<div class="control-inline">
|
|
|
@@ -58,7 +65,7 @@
|
|
|
$('#dataGrid').dataGrid({
|
|
|
searchForm: $("#searchForm"),
|
|
|
columnModel: [
|
|
|
- {header:'${text("订单编号")}', name:'orderId', index:'a.order_id', width:150, align:"center"},
|
|
|
+
|
|
|
{header:'${text("领料单号")}', name:'requisitionNo', index:'a.requisition_no', width:150, align:"center", formatter: function(val, obj, row, act){
|
|
|
if (val) {
|
|
|
// 使用 class="btnList" 通常会结合底层框架自动弹窗或打开新Tab
|
|
|
@@ -67,6 +74,8 @@ $('#dataGrid').dataGrid({
|
|
|
}
|
|
|
return '';
|
|
|
}},
|
|
|
+ {header:'${text("生产订单号")}', name:'orderId', index:'a.order_id', width:150, align:"center"},
|
|
|
+ {header:'${text("产线")}', name:'lineSn', index:'a.line_sn', width:150, align:"center"},
|
|
|
{header:'${text("更新时间")}', name:'updateTime', index:'a.update_time', width:150, align:"center"},
|
|
|
{header:'${text("创建时间")}', name:'createTime', index:'a.create_time', width:150, align:"center"},
|
|
|
{header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){
|
