diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 11a9f6a..dfb58e8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式...">
+ <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/static/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/style.css" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,26 +34,17 @@
<select />
</component>
<component name="FileEditorManager">
- <leaf>
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
- <file pinned="false" current-in-tab="false">
+ <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="7436" column="43" selection-start-line="7436" selection-start-column="39" selection-end-line="7436" selection-end-column="43" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="258">
- <caret line="7415" column="9" lean-forward="true" selection-start-line="7415" selection-start-column="9" selection-end-line="7415" selection-end-column="9" />
+ <state relative-caret-position="326">
+ <caret line="3339" column="8" selection-start-line="3339" selection-start-column="8" selection-end-line="3339" selection-end-column="8" />
</state>
</provider>
</entry>
@@ -59,24 +52,28 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="99" column="65" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
+ <state relative-caret-position="426">
+ <caret line="110" column="32" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
+ <folding>
+ <element signature="n#style#0;n#ul#0;n#div#0;n#li#0;n#ul#0;n#div#1;n#nav#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#4;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-5608" />
- </provider>
+ <provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="68" />
+ <state relative-caret-position="2354">
+ <caret line="107" column="35" selection-start-line="107" selection-start-column="35" selection-end-line="107" selection-end-column="35" />
</state>
</provider>
</entry>
@@ -84,11 +81,11 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-704">
- <caret line="88" column="57" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
+ <state relative-caret-position="344">
+ <caret line="81" column="56" selection-start-line="81" selection-start-column="56" selection-end-line="81" selection-end-column="56" />
<folding>
+ <element signature="n#li#17;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#2763#8715#0" />
</folding>
</state>
</provider>
@@ -99,10 +96,10 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
- <file pinned="false" current-in-tab="true">
+ <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="262">
+ <state relative-caret-position="-9525">
<caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
</state>
</provider>
@@ -111,7 +108,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
+ <state relative-caret-position="77990">
<caret line="3545" selection-start-line="3545" selection-end-line="3545" />
</state>
</provider>
@@ -131,8 +128,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
- <find>receiptTypeService</find>
- <find>LocationInfo</find>
<find>getLocationInfo</find>
<find>LK</find>
<find>findShipment</find>
@@ -161,6 +156,8 @@
<find>receiptDetailList</find>
<find>searchShipmentInCondition</find>
<find>png</find>
+ <find>tabRight</find>
+ <find>xx</find>
</findStrings>
<replaceStrings>
<replace />
@@ -213,11 +210,11 @@
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" />
<option value="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/task/MobileTaskController.java" />
- <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
<option value="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html" />
- <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
- <option value="$PROJECT_DIR$/target/classes/static/css/style.css" />
<option value="$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css" />
+ <option value="$PROJECT_DIR$/target/classes/static/css/style.css" />
+ <option value="$PROJECT_DIR$/src/main/resources/templates/index.html" />
+ <option value="$PROJECT_DIR$/src/main/resources/static/css/style.css" />
</list>
</option>
</component>
@@ -262,7 +259,6 @@
</navigator>
<panes>
<pane id="Scope" />
- <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -302,6 +298,15 @@
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="resources" type="462c0819:PsiDirectoryNode" />
+ <item name="static" type="462c0819:PsiDirectoryNode" />
+ <item name="css" type="462c0819:PsiDirectoryNode" />
+ </path>
+ <path>
+ <item name="wms2" type="b2602c69:ProjectViewProjectNode" />
+ <item name="wms2" type="462c0819:PsiDirectoryNode" />
+ <item name="src" type="462c0819:PsiDirectoryNode" />
+ <item name="main" type="462c0819:PsiDirectoryNode" />
+ <item name="resources" type="462c0819:PsiDirectoryNode" />
<item name="templates" type="462c0819:PsiDirectoryNode" />
</path>
<path>
@@ -353,6 +358,7 @@
<select />
</subPane>
</pane>
+ <pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
@@ -479,6 +485,10 @@
<workItem from="1588033862630" duration="20020000" />
<workItem from="1588120660621" duration="25576000" />
<workItem from="1588551696599" duration="51867000" />
+ <workItem from="1594254724771" duration="640000" />
+ <workItem from="1594341144169" duration="826000" />
+ <workItem from="1594775914845" duration="1878000" />
+ <workItem from="1594948791275" duration="6675000" />
</task>
<task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
<created>1565226427512</created>
@@ -508,11 +518,18 @@
<option name="project" value="LOCAL" />
<updated>1594027428164</updated>
</task>
- <option name="localTasksCounter" value="6" />
+ <task id="LOCAL-00006" summary="增加搜索框边距，两端对齐...">
+ <created>1594028439243</created>
+ <option name="number" value="00006" />
+ <option name="presentableId" value="LOCAL-00006" />
+ <option name="project" value="LOCAL" />
+ <updated>1594028439243</updated>
+ </task>
+ <option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="162341000" />
+ <option name="totallyTimeSpent" value="173124000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -527,7 +544,7 @@
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
- <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.25" />
+ <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49885583" visible="true" weight="0.26066098" />
<window_info id="Structure" order="1" sideWeight="0.5011442" side_tool="true" weight="0.27680966" />
<window_info id="Designer" order="2" />
<window_info id="Image Layers" order="3" />
@@ -537,7 +554,7 @@
<window_info id="Web" order="7" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32952926" />
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49932975" weight="0.38937092" />
+ <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.49932975" visible="true" weight="0.28199565" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.37635574" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -548,8 +565,9 @@
<window_info anchor="bottom" id="Statistic" order="10" />
<window_info anchor="bottom" id="Java Enterprise" order="11" weight="0.32952926" />
<window_info anchor="bottom" id="Database Changes" order="12" />
- <window_info active="true" anchor="bottom" id="Version Control" order="13" visible="true" weight="0.23318872" />
+ <window_info anchor="bottom" id="Version Control" order="13" weight="0.13867822" />
<window_info anchor="bottom" id="Messages" order="14" sideWeight="0.49865952" weight="0.32952926" />
+ <window_info anchor="bottom" id="Docker" order="15" show_stripe_button="false" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -560,6 +578,7 @@
<window_info anchor="right" id="Bean Validation" order="7" weight="0.3297587" />
<window_info anchor="right" id="Theme Preview" order="8" />
<window_info anchor="right" id="Maven Projects" order="9" weight="0.3297587" />
+ <window_info anchor="right" id="Maven" order="10" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -610,7 +629,8 @@
<MESSAGE value="添加入库、出库表实体类 添加客户、供应商增删改查接口 添加库位、容器、供应商页面" />
<MESSAGE value="修改库区service" />
<MESSAGE value="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式..." />
- <option name="LAST_COMMIT_MESSAGE" value="增加右上角消息提示，修改配置-入库配置搜索，做成折叠样式..." />
+ <MESSAGE value="增加搜索框边距，两端对齐..." />
+ <option name="LAST_COMMIT_MESSAGE" value="增加搜索框边距，两端对齐..." />
</component>
<component name="WindowStateProjectService">
<state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" />
@@ -979,67 +999,71 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
+ <state relative-caret-position="2354">
+ <caret line="107" column="35" selection-start-line="107" selection-start-column="35" selection-end-line="107" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/add.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-5608" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="528">
- <caret line="99" column="65" selection-start-line="99" selection-start-column="65" selection-end-line="99" selection-end-column="65" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/report.html">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/bootstrap.min.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="148">
- <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="68" />
+ <state relative-caret-position="77990">
+ <caret line="3545" selection-start-line="3545" selection-end-line="3545" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="165">
- <caret line="7436" column="43" selection-start-line="7436" selection-start-column="39" selection-end-line="7436" selection-end-column="43" />
+ <state relative-caret-position="-9525">
+ <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/list.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-704">
- <caret line="88" column="57" selection-start-line="88" selection-start-column="57" selection-end-line="88" selection-end-column="57" />
+ <state relative-caret-position="344">
+ <caret line="81" column="56" selection-start-line="81" selection-start-column="56" selection-end-line="81" selection-end-column="56" />
<folding>
+ <element signature="n#li#17;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#p#0;n#ul#0;n#div#0;n#div#0;n#form#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="e#2763#8715#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/target/classes/static/css/style.css">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="258">
- <caret line="7415" column="9" lean-forward="true" selection-start-line="7415" selection-start-column="9" selection-end-line="7415" selection-end-column="9" />
+ <state relative-caret-position="225">
+ <caret line="165" column="4" lean-forward="true" selection-start-line="165" selection-start-column="4" selection-end-line="167" selection-end-column="16" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/resources/static/huaheng/css/huahengUI.css">
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/main.html">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="262">
- <caret line="636" column="18" selection-start-line="636" selection-start-column="18" selection-end-line="636" selection-end-column="18" />
+ <state relative-caret-position="426">
+ <caret line="110" column="32" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
+ <folding>
+ <element signature="n#style#0;n#ul#0;n#div#0;n#li#0;n#ul#0;n#div#1;n#nav#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#small#1;n#div#0;n#div#0;n#li#4;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/style.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="326">
+ <caret line="3339" column="8" selection-start-line="3339" selection-start-column="8" selection-end-line="3339" selection-end-column="8" />
</state>
</provider>
</entry>
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index e2002e4..361afb4 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -163,7 +163,11 @@ body.body-small .navbar-top-links li:last-child {
}
.dropdown-messages, .dropdown-alerts {
- padding: 10px 10px 10px 10px;
+ padding: 20px;
+ position: relative;
+ width: 300px;
+ top: 0px;
+ left: -100px;
}
.dropdown-messages li a, .dropdown-alerts li a {
@@ -1313,6 +1317,7 @@ button.dim:active:before {
.media-body {
display: block;
width: auto;
+ height:60px; overflow:hidden;position: relative;top: -8px;padding-left: 20px;/*border-bottom: 1px dotted #e5e5e5;*/
}
.chat-element>.pull-left {
@@ -3329,11 +3334,21 @@ nav.page-tabs .page-tabs-content {
/*.content-tabs.xx{
width: 50px;
}*/
+.xx_box{
+ position: absolute;right: 203px;top:0;width: 40px;height: 40px; text-align:center;background: #fff;border-left: solid 1px #eee;
+}
+.xx_box a.xx{
+ color: #999;
+ display: block;
+}
+.xx_box a:hover{
+ background: #f2f2f2;
+}
.xx sup{
/*line-height: 12px;
padding: 2px 5px;*/
position: absolute;
- right:6px;
+ /*right:6px;*/
top: 5px;
background-color: #ed5565;
color: #FFFFFF;
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 348ad03..8d6c186 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -18,6 +18,14 @@
<link th:href="@{/css/animate.css}" rel="stylesheet"/>
<link th:href="@{/css/style.css}" rel="stylesheet"/>
<link th:href="@{/huaheng/css/huahengUI.min.css?v=2.3.0}" rel="stylesheet"/>
+ <style type="text/css">
+ .dropdown-menu .divider {
+ height: 1px;
+ margin: 0px 0 10px 0;
+ overflow: hidden;
+ background-color: #e5e5e5;
+ }
+ </style>
</head>
<body class="fixed-sidebar full-height-layout gray-bg" style="overflow: hidden" th:classappend="${@config.getKey('sys.index.skinName')}">
<div id="wrapper">
@@ -95,10 +103,65 @@
<button class="roll-nav roll-right tabRight0">
<i class="fa fa-forward"></i>
</button>
- <button class="roll-nav roll-right tabRight xx">
- <i class="fa fa-envelope"></i><sup></sup>
- <!--<span class="label label-primary">8</span>-->
- </button>
+ <!--<button class="roll-nav roll-right tabRight xx">
+ <a href="#" data-toggle="dropdown"> <i class="fa fa-envelope"></i><sup></sup></a>
+ <!–<span class="label label-primary">8</span>–>
+ </button>-->
+ <!--消息-->
+ <div class="xx_box">
+ <a class="dropdown-toggle count-info xx" data-toggle="dropdown" href="#">
+ <i class="fa fa-envelope"></i> <sup></sup> <!--<span class="label label-warning">16</span>-->
+ </a>
+ <ul class="dropdown-menu dropdown-messages">
+ <li>
+ <div class="dropdown-messages-box">
+ <a href="profile.html" class="pull-left">
+ <img alt="image" class="img-circle" src="http://cn.inspinia.cn/html/inspiniaen/img/a7.jpg">
+ </a>
+ <div class="media-body" style="">
+ <small class="pull-right">46小时前</small>
+ <strong>小明</strong> 评论了 <strong>小红</strong>. <br>
+ <small class="text-muted" style="position: relative;top:-20px">2017.10.06 7:58</small>
+ </div>
+ </div>
+ </li>
+ <li class="divider"></li>
+ <li>
+ <div class="dropdown-messages-box">
+ <a href="profile.html" class="pull-left">
+ <img alt="image" class="img-circle" src="http://cn.inspinia.cn/html/inspiniaen/img/a4.jpg">
+ </a>
+ <div class="media-body ">
+ <small class="pull-right text-navy">5小时前</small>
+ <strong>小红</strong> 打电话给了 <strong>小黑</strong>. <br>
+ <small class="text-muted" style="position: relative;top:-20px">2017.10.06 7:58</small>
+ </div>
+ </div>
+ </li>
+ <li class="divider"></li>
+ <li>
+ <div class="dropdown-messages-box">
+ <a href="profile.html" class="pull-left">
+ <img alt="image" class="img-circle" src="http://cn.inspinia.cn/html/inspiniaen/img/profile.jpg">
+ </a>
+ <div class="media-body ">
+ <small class="pull-right">23小时前</small>
+ <strong>小黑</strong> 点赞了 <strong>小红</strong>. <br>
+ <small class="text-muted" style="position: relative;top:-20px">2017.10.06 7:58</small>
+ </div>
+ </div>
+ </li>
+ <li class="divider"></li>
+ <li>
+ <div class="text-center link-block">
+ <a href="mailbox.html">
+ <i class="fa fa-envelope"></i> <strong>阅读所有消息</strong>
+ </a>
+ </div>
+ </li>
+ </ul>
+ </div>
+ <!--消息-->
<div class="btn-group roll-nav roll-right">
<button class="dropdown J_tabClose" data-toggle="dropdown">
页签操作<span class="caret"></span>
diff --git a/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html b/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
index 1fc3602..d70f99c 100644
--- a/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
+++ b/src/main/resources/templates/inventory/cyclecountHeader/cyclecountHeader.html
@@ -2,14 +2,6 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
-<style>
- #toolbar1 {
- display: inline-block;
- /*position: absolute;
- margin: 10px auto;*/
- line-height: 34px;
- }
-</style>
<body class="gray-bg">
<div class="container-div">
<div class="row">
@@ -109,10 +101,6 @@
sortName: "created",
sortOrder: "desc",
search: false,
-
- // onDblClickRow: function (row) {
- // showDetail(row.id,row.code);
- // },
onDblClickRow:function(row){
detail(row.id,row.masterCode);
},