diff --git a/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java b/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java
index 15d6296..e12233c 100644
--- a/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java
+++ b/src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java
@@ -96,6 +96,7 @@ public class StatusFlowDetailController extends BaseController {
StatusFlowHeader statusFlowHeader = statusFlowHeaderService.getById(headerId);
mmap.put("headerId",headerId);
mmap.put("headerCode", statusFlowHeader.getCode());
+ mmap.put("moduleType", statusFlowHeader.getModuleType());
return prefix + "/add";
}
diff --git a/src/main/resources/templates/config/filterConfigHeader/add.html b/src/main/resources/templates/config/filterConfigHeader/add.html
index 4527783..e07a189 100644
--- a/src/main/resources/templates/config/filterConfigHeader/add.html
+++ b/src/main/resources/templates/config/filterConfigHeader/add.html
@@ -9,7 +9,10 @@
<div class="form-group">
<label class="col-sm-3 control-label">类型：</label>
<div class="col-sm-8">
- <select id="recordType" name="recordType" class="form-control" th:with="recordType=${@dict.getType('recordType')}">
+ <select id="recordType" name="recordType" class="form-control" th:if="${moduleType == 'receipt'}" th:with="recordType=${@dict.getType('receiptRuleType')}">
+ <option th:each="item : ${recordType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"></option>
+ </select>
+ <select id="recordType" name="recordType" class="form-control" th:if="${moduleType != 'receipt'}" th:with="recordType=${@dict.getType('shipmentRuleType')}">
<option th:each="item : ${recordType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"></option>
</select>
</div>
diff --git a/src/main/resources/templates/config/receiptPreference/receiptPreference.html b/src/main/resources/templates/config/receiptPreference/receiptPreference.html
index 8bac2f9..6b72a1b 100644
--- a/src/main/resources/templates/config/receiptPreference/receiptPreference.html
+++ b/src/main/resources/templates/config/receiptPreference/receiptPreference.html
@@ -139,6 +139,7 @@
{
field : 'manuallyBuildLPN',
title : '人工组盘',
+ align : "center",
formatter : function(value, row, index) {
return $.table.selectWhetherLabel(value);
},
diff --git a/src/main/resources/templates/config/receiptType/add.html b/src/main/resources/templates/config/receiptType/add.html
index f3cb72f..d97147b 100644
--- a/src/main/resources/templates/config/receiptType/add.html
+++ b/src/main/resources/templates/config/receiptType/add.html
@@ -47,6 +47,7 @@
<label class="col-sm-3 control-label">入库流程：</label>
<div class="col-sm-8">
<select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}">
+ <option value="">请选择</option>
<option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
</select>
</div>
diff --git a/src/main/resources/templates/config/receiptType/edit.html b/src/main/resources/templates/config/receiptType/edit.html
index 7120b74..a092d68 100644
--- a/src/main/resources/templates/config/receiptType/edit.html
+++ b/src/main/resources/templates/config/receiptType/edit.html
@@ -49,6 +49,7 @@
<label class="col-sm-3 control-label">入库流程：</label>
<div class="col-sm-8">
<select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList('receivingFlow')}" th:field="*{receiptFlow}">
+ <option value="">请选择</option>
<option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
</select>
</div>
diff --git a/src/main/resources/templates/config/statusFlowDetail/add.html b/src/main/resources/templates/config/statusFlowDetail/add.html
index 0b63952..7854e00 100644
--- a/src/main/resources/templates/config/statusFlowDetail/add.html
+++ b/src/main/resources/templates/config/statusFlowDetail/add.html
@@ -16,9 +16,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">模块：</label>
<div class="col-sm-8">
- <select id="moduleType" name="moduleType" class="form-control" th:with="moduleType=${@dict.getType('moduleType')}">
- <option th:each="item : ${moduleType}" th:text="${item['dictLabel']}" th:value="${item['dictValue']}"></option>
- </select>
+ <input id="moduleType" name="moduleType" class="form-control" type="text" th:value="${moduleType}" readonly="readonly">
</div>
</div>
<div class="form-group">
diff --git a/src/main/resources/templates/receipt/receiptDetail/edit.html b/src/main/resources/templates/receipt/receiptDetail/edit.html
index 19ee366..a7d31fc 100644
--- a/src/main/resources/templates/receipt/receiptDetail/edit.html
+++ b/src/main/resources/templates/receipt/receiptDetail/edit.html
@@ -53,7 +53,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">是否质检：</label>
<div class="col-sm-8">
- <select id="qcCheck" name="qcCheck" class="form-control">
+ <select id="qcCheck" name="qcCheck" class="form-control" th:field="*{qcCheck}">
<option value="1">否</option>
<option value="0">是</option>
</select>
diff --git a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
index d74170f..4bb7e80 100644
--- a/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
+++ b/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
@@ -474,7 +474,17 @@
},
{
field : 'qcCheck',
- title : '是否质检'
+ title : '是否质检',
+ align : "center",
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (value == 0) {
+ actions.push("<span class='badge badge-info'>是</span>");
+ } else {
+ actions.push("<span class='badge badge-info'>否</span>");
+ }
+ return actions.join('');
+ }
},
{
field : 'projectNo',
@@ -547,6 +557,7 @@
{
field : 'isVirtualBom',
title : '是否虚拟套件',
+ align : "center",
formatter: function(value, row, index) {
return $.table.selectDictLabel(isVirtualBoms, value);
}