sunbo/jlr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JLR1.0

Browse Source
This commit is contained in:
sunrich
2018-11-21 10:39:17 +08:00
parent 1364fe53a4
commit 9d773f6102
3 changed files with 80 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

254
.idea/workspace.xml generated
View File

@ -8,6 +8,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment=""> <list default="true" id="286df1c9-36cd-4219-b771-4a7f2984929b" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" afterPath="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
</list> </list>
<ignored path="$PROJECT_DIR$/target/" /> <ignored path="$PROJECT_DIR$/target/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -22,60 +24,29 @@
<file leaf-file-name="caseDetails.jsp" pinned="false" current-in-tab="false"> <file leaf-file-name="caseDetails.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6587"> <state relative-caret-position="682">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="79" column="34" lean-forward="true" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="caseDetail.jsp" pinned="false" current-in-tab="true"> <file leaf-file-name="footer.jsp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="caseDetail.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7410"> <state relative-caret-position="3951">
<caret line="947" column="31" lean-forward="true" selection-start-line="947" selection-start-column="31" selection-end-line="947" selection-end-column="31" /> <caret line="708" column="31" lean-forward="true" selection-start-line="708" selection-start-column="31" selection-end-line="708" selection-end-column="31" />
<folding> <folding />
<element signature="e#1565#1597#0#HTML" expanded="true" />
<element signature="e#1787#1829#0#HTML" expanded="true" />
<element signature="e#1885#1903#0#HTML" expanded="true" />
<element signature="e#14265#14291#0#HTML" expanded="true" />
<element signature="e#14384#14410#0#HTML" expanded="true" />
<element signature="e#14831#14857#0#HTML" expanded="true" />
<element signature="e#14946#14972#0#HTML" expanded="true" />
<element signature="e#15187#15213#0#HTML" expanded="true" />
<element signature="e#15392#15418#0#HTML" expanded="true" />
<element signature="e#15602#15628#0#HTML" expanded="true" />
<element signature="e#15990#16016#0#HTML" expanded="true" />
<element signature="e#16439#16465#0#HTML" expanded="true" />
<element signature="e#16590#16616#0#HTML" expanded="true" />
<element signature="e#16800#16826#0#HTML" expanded="true" />
<element signature="e#16978#17004#0#HTML" expanded="true" />
<element signature="e#17220#17246#0#HTML" expanded="true" />
<element signature="e#17362#17388#0#HTML" expanded="true" />
<element signature="e#17684#17732#0#HTML" expanded="true" />
<element signature="e#17946#18000#0#HTML" expanded="true" />
<element signature="e#27118#27172#0#HTML" expanded="true" />
<element signature="e#27327#27353#0#HTML" expanded="true" />
<element signature="e#27525#27555#0#HTML" expanded="true" />
<element signature="e#28226#28244#0#HTML" expanded="true" />
<element signature="e#28340#28380#0#HTML" expanded="true" />
<element signature="e#28531#28561#0#HTML" expanded="true" />
<element signature="e#28680#28706#0#HTML" expanded="true" />
<element signature="e#28893#28923#0#HTML" expanded="true" />
<element signature="e#29384#29402#0#HTML" expanded="true" />
<element signature="e#29497#29537#0#HTML" expanded="true" />
<element signature="e#29767#29807#0#HTML" expanded="true" />
<element signature="e#30102#30128#0#HTML" expanded="true" />
<element signature="e#30718#30736#0#HTML" expanded="true" />
<element signature="e#30925#30964#0#HTML" expanded="true" />
<element signature="e#31700#31740#0#HTML" expanded="true" />
<element signature="e#32436#32476#0#HTML" expanded="true" />
<element signature="e#33189#33229#0#HTML" expanded="true" />
<element signature="e#33357#33387#0#HTML" expanded="true" />
<element signature="e#33692#33732#0#HTML" expanded="true" />
<element signature="e#34586#34625#0#HTML" expanded="true" />
<element signature="e#35383#35423#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -90,44 +61,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="footer.jsp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-264">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<marker date="1542767267214" expanded="true" signature="7766:8630" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="7962:8026" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8042:8621" ph="{&quot;type&quot;: &quot;POST&quot;...}" />
<marker date="1542767267214" expanded="true" signature="8281:8339" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8378:8611" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8467:8535" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8541:8597" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8657:8811" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8740:8800" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8846:9255" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9063:9105" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9111:9249" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9284:10511" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9353:10505" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9509:10493" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9642:10363" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9685:9781" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9811:10272" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9922:10250" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10047:10224" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10278:10345" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10659:10699" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10740:11165" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10860:10905" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10919:11159" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11097:11149" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11559:11609" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@ -175,6 +108,7 @@
</dirStrings> </dirStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="UPDATE_TYPE" value="MERGE" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="GradleLocalSettings"> <component name="GradleLocalSettings">
@ -198,7 +132,6 @@
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/SupplierAction.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/action/SupplierAction.java" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/OrderCheckDaoImpl.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/dao/impl/OrderCheckDaoImpl.java" />
<option value="$PROJECT_DIR$/src/main/webapp/js/business/cases.js" /> <option value="$PROJECT_DIR$/src/main/webapp/js/business/cases.js" />
<option value="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/user.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/user.jsp" />
<option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/EnterpriseService.java" /> <option value="$PROJECT_DIR$/src/main/java/com/zhongdao/jlr/business/service/EnterpriseService.java" />
<option value="$PROJECT_DIR$/src/main/webapp/js/business/enterprise.js" /> <option value="$PROJECT_DIR$/src/main/webapp/js/business/enterprise.js" />
@ -236,6 +169,7 @@
<option value="$PROJECT_DIR$/src/main/webapp/page/header.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/header.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/home.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/home.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" /> <option value="$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp" />
<option value="$PROJECT_DIR$/src/main/webapp/page/footer.jsp" />
</list> </list>
</option> </option>
</component> </component>
@ -316,40 +250,6 @@
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" /> <item name="main" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="jlr" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="main" type="462c0819:PsiDirectoryNode" />
<item name="java" type="462c0819:PsiDirectoryNode" />
<item name="com" type="462c0819:PsiDirectoryNode" />
<item name="jlr" type="462c0819:PsiDirectoryNode" />
<item name="business" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="jlr" type="b2602c69:ProjectViewProjectNode" /> <item name="jlr" type="b2602c69:ProjectViewProjectNode" />
<item name="JLR-master" type="462c0819:PsiDirectoryNode" /> <item name="JLR-master" type="462c0819:PsiDirectoryNode" />
@ -710,7 +610,7 @@
<workItem from="1542266860375" duration="629000" /> <workItem from="1542266860375" duration="629000" />
<workItem from="1542590853085" duration="13495000" /> <workItem from="1542590853085" duration="13495000" />
<workItem from="1542677147951" duration="22239000" /> <workItem from="1542677147951" duration="22239000" />
<workItem from="1542763435853" duration="1542000" /> <workItem from="1542763435853" duration="2153000" />
</task> </task>
<task id="LOCAL-00001" summary="ceshi"> <task id="LOCAL-00001" summary="ceshi">
<created>1540174575886</created> <created>1540174575886</created>
@ -740,11 +640,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1542767322708</updated> <updated>1542767322708</updated>
</task> </task>
<option name="localTasksCounter" value="5" /> <task id="LOCAL-00005" summary="JLR1.0">
<created>1542767331334</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1542767331334</updated>
</task>
<option name="localTasksCounter" value="6" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="868735000" /> <option name="totallyTimeSpent" value="869346000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -781,7 +688,7 @@
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6689537" sideWeight="0.49394855" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6689537" sideWeight="0.49394855" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25340393" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20953101" sideWeight="0.49315068" order="0" side_tool="false" content_ui="combo" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29198185" sideWeight="0.5068493" order="5" side_tool="true" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29198185" sideWeight="0.5068493" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" />
@ -1223,14 +1130,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-6587">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/footers.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3828"> <state relative-caret-position="-3828">
@ -1239,88 +1138,27 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetails.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-264"> <state relative-caret-position="682">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="79" column="34" lean-forward="true" selection-start-line="79" selection-start-column="34" selection-end-line="79" selection-end-column="34" />
<folding> <folding />
<marker date="1542767267214" expanded="true" signature="7766:8630" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="7962:8026" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8042:8621" ph="{&quot;type&quot;: &quot;POST&quot;...}" />
<marker date="1542767267214" expanded="true" signature="8281:8339" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8378:8611" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8467:8535" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8541:8597" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8657:8811" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8740:8800" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="8846:9255" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9063:9105" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9111:9249" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9284:10511" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9353:10505" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9509:10493" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9642:10363" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9685:9781" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9811:10272" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="9922:10250" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10047:10224" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10278:10345" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10659:10699" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10740:11165" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10860:10905" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="10919:11159" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11097:11149" ph="{...}" />
<marker date="1542767267214" expanded="true" signature="11559:11609" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp"> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/caseDetail.jsp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7410"> <state relative-caret-position="3951">
<caret line="947" column="31" lean-forward="true" selection-start-line="947" selection-start-column="31" selection-end-line="947" selection-end-column="31" /> <caret line="708" column="31" lean-forward="true" selection-start-line="708" selection-start-column="31" selection-end-line="708" selection-end-column="31" />
<folding> <folding />
<element signature="e#1565#1597#0#HTML" expanded="true" /> </state>
<element signature="e#1787#1829#0#HTML" expanded="true" /> </provider>
<element signature="e#1885#1903#0#HTML" expanded="true" /> </entry>
<element signature="e#14265#14291#0#HTML" expanded="true" /> <entry file="file://$PROJECT_DIR$/src/main/webapp/page/footer.jsp">
<element signature="e#14384#14410#0#HTML" expanded="true" /> <provider selected="true" editor-type-id="text-editor">
<element signature="e#14831#14857#0#HTML" expanded="true" /> <state relative-caret-position="176">
<element signature="e#14946#14972#0#HTML" expanded="true" /> <caret line="11" column="9" lean-forward="true" selection-start-line="11" selection-start-column="9" selection-end-line="11" selection-end-column="9" />
<element signature="e#15187#15213#0#HTML" expanded="true" /> <folding />
<element signature="e#15392#15418#0#HTML" expanded="true" />
<element signature="e#15602#15628#0#HTML" expanded="true" />
<element signature="e#15990#16016#0#HTML" expanded="true" />
<element signature="e#16439#16465#0#HTML" expanded="true" />
<element signature="e#16590#16616#0#HTML" expanded="true" />
<element signature="e#16800#16826#0#HTML" expanded="true" />
<element signature="e#16978#17004#0#HTML" expanded="true" />
<element signature="e#17220#17246#0#HTML" expanded="true" />
<element signature="e#17362#17388#0#HTML" expanded="true" />
<element signature="e#17684#17732#0#HTML" expanded="true" />
<element signature="e#17946#18000#0#HTML" expanded="true" />
<element signature="e#27118#27172#0#HTML" expanded="true" />
<element signature="e#27327#27353#0#HTML" expanded="true" />
<element signature="e#27525#27555#0#HTML" expanded="true" />
<element signature="e#28226#28244#0#HTML" expanded="true" />
<element signature="e#28340#28380#0#HTML" expanded="true" />
<element signature="e#28531#28561#0#HTML" expanded="true" />
<element signature="e#28680#28706#0#HTML" expanded="true" />
<element signature="e#28893#28923#0#HTML" expanded="true" />
<element signature="e#29384#29402#0#HTML" expanded="true" />
<element signature="e#29497#29537#0#HTML" expanded="true" />
<element signature="e#29767#29807#0#HTML" expanded="true" />
<element signature="e#30102#30128#0#HTML" expanded="true" />
<element signature="e#30718#30736#0#HTML" expanded="true" />
<element signature="e#30925#30964#0#HTML" expanded="true" />
<element signature="e#31700#31740#0#HTML" expanded="true" />
<element signature="e#32436#32476#0#HTML" expanded="true" />
<element signature="e#33189#33229#0#HTML" expanded="true" />
<element signature="e#33357#33387#0#HTML" expanded="true" />
<element signature="e#33692#33732#0#HTML" expanded="true" />
<element signature="e#34586#34625#0#HTML" expanded="true" />
<element signature="e#35383#35423#0#HTML" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>

362
src/main/webapp/page/caseDetail.jsp
View File

@ -46,19 +46,6 @@
.Wdate { .Wdate {
padding-left: 0; padding-left: 0;
} }
.table > tbody > tr > td {
width: 50%;
display: inline-table;
}
.table > tbody > tr > td > label {
width: 20%;
vertical-align: top;
margin-top: 10px;
}
.table > tbody > tr > td > input,.table > tbody > tr > td > select {
width: 70%;
height: 38px;
}
</style> </style>
<div id="main" style="width:75%;margin:0 auto;"> <div id="main" style="width:75%;margin:0 auto;">
<div id="moduleCtId"> <div id="moduleCtId">
@ -307,328 +294,16 @@
<tbody> <tbody>
<tr> <tr>
<td colspan="6" style="height:30px;margin-top:30px;width: 100%;"> <td colspan="6" style="height:30px;padding-top:30px;">
<hr/> <hr/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="6"> <td colspan="6">
<h2 style="font-size:20px;margin-bottom:40px;margin-top:0">路修</h2> <h2 style="font-size:20px;margin-bottom:40px;margin-top:0">经销商必填信息</h2>
</td>
</tr>
<%-- 是否修复车辆 开始--%>
<%-- <tr>
<td class="ng-binding" style="position:relative;">
<label for="">是否修复车辆:</label>
<select id="repairCar"
name="" style="width:70%;height:38px;"
class="js-example-basic-single select2-hidden-accessible" tabindex="-1"
aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="3">否</option>
<option value="2">其他</option>
</select>
<font style="color:red;">*</font>
</td>
<td class="ng-binding" style="position:relative;display: none" id="repairCarDetailWrapper">
<label for="">描述(最多100字):</label>
<textarea id="" name="" style="width:70%;height:70px;"
class="mc-textarea"></textarea>
</td>
&lt;%&ndash; 是否修复车辆 结束 &ndash;%&gt;
&lt;%&ndash; 是否有质量问题 开始 &ndash;%&gt;
<td class="ng-binding" style="position:relative;">
<label for="">是否质量问题:</label>
<select id="qualityProblem" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="3">否</option>
<option value="2">未知</option>
</select>
<font style="color:red;">*</font>
</td>
&lt;%&ndash; 是否有质量问题 选择未知 开始 &ndash;%&gt;
<td class="ng-binding unknowProblem qualityProblemUnknow" style="position:relative;display: none">
<label for="">EPQR:</label>
<input value="" id="" />
</td>
&lt;%&ndash; 是否有质量问题 选择未知 结束 &ndash;%&gt;
&lt;%&ndash; 是否有质量问题 选择是 开始 &ndash;%&gt;
<td class="ng-binding qualityProblemYes" style="position:relative;display: none;">
<label for="">是否有技术公告:</label>
<select id="technologyNotice" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
</td>
&lt;%&ndash; 有技术公告 开始 &ndash;%&gt;
<td class="ng-binding qualityProblemYes technologyNoticeYes" style="position:relative;display: none;">
<label for="">是否有效:</label>
<select id="effectiveProblem" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
</td>
&lt;%&ndash; 有效 开始 &ndash;%&gt;
<td class="ng-binding qualityProblemYes technologyNoticeYes effectiveProblemYes" style="position:relative;display: none;" >
<label for="">技术公告号(最多15个字):</label>
<textarea id="" name="" style="width:70%;height:70px;" class="mc-textarea"></textarea>
</td>
&lt;%&ndash; 有效 结束 &ndash;%&gt;
&lt;%&ndash; 无效 开始 &ndash;%&gt;
<td class="ng-binding qualityProblemYes technologyNoticeYes effectiveProblemNo" style="position:relative;display: none;">
<label for="">
<select name="" id="">
<option value="">请选择</option>
<option value="EPQR">EPQR</option>
<option value="TA">TA</option>
<option value="技术公告号">技术公告号</option>
</select>
</label>
<input value="" id="" />
</td>
&lt;%&ndash; 无效 结束 &ndash;%&gt;
&lt;%&ndash; 有技术公告 结束 &ndash;%&gt;
&lt;%&ndash; 没有技术公告 开始 &ndash;%&gt;
<td class="ng-binding unknowProblem qualityProblemYes technologyNoticeNo" style="position:relative;display: none">
<label for="">
<select name="" id="">
<option value="">请选择</option>
<option value="EPQR">EPQR</option>
<option value="TA">TA</option>
</select>
</label>
<input value="" id="" />
</td>
&lt;%&ndash; 没有技术公告 结束 &ndash;%&gt;
&lt;%&ndash; 是否有质量问题 选择是 结束 &ndash;%&gt;
&lt;%&ndash; 是否有质量问题 结束 &ndash;%&gt;
&lt;%&ndash; 维修 开始 &ndash;%&gt;
<td class="ng-binding" style="position:relative;">
<label for="">
维修
</label>
<select name="" id="repairOptions">
<option value="">请选择</option>
<option value="1">搭电</option>
<option value="2">打气</option>
<option value="3">换胎</option>
<option value="4">解档</option>
<option value="5">安装</option>
<option value="6">其他处理</option>
</select>
<font style="color:red;">*</font>
</td>
&lt;%&ndash;选择 搭电 s &ndash;%&gt;
<td class="ng-binding" style="position:relative;display: none;" id="betteryCheck">
<label for="">电瓶检查:</label>
<input value="" id="" />
</td>
&lt;%&ndash;选择 搭电 s &ndash;%&gt;
&lt;%&ndash;选择 安装 s &ndash;%&gt;
<td class="ng-binding" style="position:relative;display: none;" id="writeParts">
<label for="">填写零件(最多30个字):</label>
<input value="" id="" />
</td>
&lt;%&ndash;选择 安装 e &ndash;%&gt;
&lt;%&ndash;选择 其他处理 s &ndash;%&gt;
<td class="ng-binding" style="position:relative;display: none;" id="repairDescirbe">
<label for="">描述(最多30个字):</label>
<input value="" id="" />
</td>
&lt;%&ndash;选择 其他处理 e &ndash;%&gt;
&lt;%&ndash; 维修 结束 &ndash;%&gt;
&lt;%&ndash; 工单号 s &ndash;%&gt;
<td class="ng-binding unknowProblem" style="position:relative;">
<label for="">工单号:</label>
<input value="NA" id="" disabled="disabled" />
</td>
&lt;%&ndash; 工单号 e &ndash;%&gt;
</tr>
--%>
<tr>
<td colspan="6">
<h2 style="font-size:20px;margin-bottom:40px;margin-top:0">进店维修</h2>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="ng-binding" style="position:relative;">
<label for="">维修:</label>
<select id="repairEnterCompany"
name="" style="width:70%;height:38px;"
class="js-example-basic-single select2-hidden-accessible" tabindex="-1"
aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">已修复</option>
<option value="2">正在维修</option>
<option value="3">等待维修授权</option>
<option value="4">问题未再现</option>
<option value="5">其他</option>
</select>
<font style="color:red;">*</font>
</td>
<td class="ng-binding" style="position:relative;display: none;" id="repairEnterCompanyOtherDetail">
<label for="">描述:</label>
<textarea id="" name="" style="width:70%;height:70px;" class="mc-textarea"></textarea>
</td>
<td class="ng-binding" style="position:relative;">
<label for="">是否有工单号:</label>
<select id="repairEnterCompanyOrderNumber"
name="" style="width:70%;height:38px;"
class="js-example-basic-single select2-hidden-accessible" tabindex="-1"
aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
<font style="color:red;">*</font>
</td>
<td class="ng-binding" style="position:relative;display: none;" id="HasRepairOrderNumber">
<label for="">工单号:</label>
<input value="" id="" />
</td>
<td class="ng-binding" style="position:relative;display: none;" id="HasNotRepairOrderNumber">
<label for="">原因(最多20个字):</label>
<input value="" id="" />
</td>
<%-- 是否有质量问题 开始 --%>
<td class="ng-binding" style="position:relative;">
<label for="">是否质量问题:</label>
<select id="repairEnterCompanyQuality" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="2">否</option>
<option value="3">未知</option>
</select>
<font style="color:red;">*</font>
</td>
<%-- 是否有质量问题 选择未知 开始 --%>
<td class="ng-binding repairEnterCompanyQualityUnknow" style="position:relative;display: none">
<label for="">
<select name="" id="">
<option value="">请选择</option>
<option value="EPQR">EPQR</option>
<option value="TA">TA</option>
</select>
</label>
<input value="" id="" />
</td>
<%-- 是否有质量问题 选择未知 结束 --%>
<%-- 是否有质量问题 选择是 开始 --%>
<td class="ng-binding repairEnterCompanyQualityYes repairEnterCompanyTechnology" style="position:relative;display: none;">
<label for="">是否有技术公告:</label>
<select id="repairEnterCompanyTechnologyNotice" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
</td>
<%-- 有技术公告 开始 --%>
<td class="ng-binding repairEnterCompanyQualityYes repairEnterCompanyTechnologyYes" style="position:relative;display: none;">
<label for="">是否有效:</label>
<select id="repairEnterCompanyEffectiveProblem" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">是</option>
<option value="2">否</option>
</select>
</td>
<%-- 有效 开始 --%>
<td class="ng-binding repairEnterCompanyQualityYes repairEnterCompanyTechnologyYes repairEnterEffectiveYes" style="position:relative;display: none;" >
<label for="">技术公告号(最多15个字):</label>
<textarea id="" name="" style="width:70%;height:70px;" class="mc-textarea"></textarea>
</td>
<%-- 有效 结束 --%>
<%-- 无效 开始 --%>
<td class="ng-binding repairEnterCompanyQualityYes repairEnterCompanyTechnologyYes repairEnterEffectiveNo" style="position:relative;display: none;">
<label for="">
<select name="" id="">
<option value="">请选择</option>
<option value="EPQR">EPQR</option>
<option value="TA">TA</option>
<option value="技术公告号">技术公告号</option>
</select>
</label>
<input value="" id="" />
</td>
<%-- 无效 结束 --%>
<%-- 有技术公告 结束 --%>
<%-- 没有技术公告 开始 --%>
<td class="ng-binding repairEnterCompanyQualityYes repairEnterCompanyTechnologyNo" style="position:relative;display: none">
<label for="">
<select name="" id="">
<option value="">请选择</option>
<option value="EPQR">EPQR</option>
<option value="TA">TA</option>
</select>
</label>
<input value="" id="" />
</td>
<%-- 没有技术公告 结束 --%>
<%-- 是否有质量问题 选择是 结束 --%>
<%-- 是否有质量问题 选择否 开始 --%>
<td class="ng-binding repairEnterCompanyQualityNo" style="position:relative;display: none;">
<label for="">类型</label>
<select id="" name="" class="js-example-basic-single select2-hidden-accessible" tabindex="-1" aria-hidden="true">
<option value="" checked>--请选择--</option>
<option value="1">事故</option>
<option value="2">涉水</option>
<option value="3">人为错误</option>
<option value="4">外力损坏</option>
<option value="5">维护保养不当</option>
<option value="6">车辆属性</option>
<option value="7">其他外部因素</option>
</select>
</td>
<%-- 是否有质量问题 选择否 结束 --%>
<%-- 是否有质量问题 结束 --%>
</tr>
<%--<tr>
<th>DMS单号:</th> <th>DMS单号:</th>
<td class="ng-binding" style="position:relative;"> <td class="ng-binding" style="position:relative;">
<!-- id="input43Wrap"> --> <!-- id="input43Wrap"> -->
@ -972,7 +647,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="6" style="height:10px;"></td> <td colspan="6" style="height:10px;"></td>
</tr>--%> </tr>
</tbody> </tbody>
</table> </table>
@ -1000,4 +675,35 @@
</div> </div>
</div> </div>
</div> </div>
<div class="order_undo" id="caseinfoEdit_windowContent" style="display: none;">
<div class="dialog_default">
<div class="dialog_title">
故障零件查询选择列表
</div>
<div class="dialog_con">
<div class="result_input">
<span class="line">&nbsp;</span>主系统：
</div>
<select id="caseInfoEdit20SelCtshow_ComponentInfoGroups" class="money_con"></select>
<div class="result_input">
<span class="line">&nbsp;</span>子系统：
</div>
<select id="caseInfoEdit20SelCtshow_CLSubSystem" class="money_con"></select>
<div class="result_input">
<span class="line">&nbsp;</span>元件：
</div>
<select id="caseInfoEdit20SelCtshow_CLElement" class="money_con"></select>
<div class="confirm_cancel clearfix">
<a href="javascript:void(0);" id="caseInfoEdit20SelCtshow_OK" class="btn2">确&nbsp;&nbsp;定</a>
<a href="javascript:void(0);" id="caseInfoEdit20SelCtshow_Cancel"
class="btn1 cancel">取&nbsp;&nbsp;消</a>
</div>
</div>
</div>
</div>
<%@ include file="footers.jsp" %> <%@ include file="footers.jsp" %>

184
src/main/webapp/page/footer.jsp
View File

@ -2,190 +2,6 @@
pageEncoding="utf-8" %> pageEncoding="utf-8" %>
<script type="text/javascript" src="<%=webpath%>/js/DatePicker/WdatePicker.js"></script> <script type="text/javascript" src="<%=webpath%>/js/DatePicker/WdatePicker.js"></script>
<script type="text/javascript"> <script type="text/javascript">
/**
* 是否选择车辆 ， 选择其他 ，显示描述的文本框
* */
$("#repairCar").change(function () {
if($("#repairCar").val() == 2){
$("#repairCarDetailWrapper").show();
}else {
$("#repairCarDetailWrapper").hide();
}
})
/**
* 是否有质量问题
* */
$("#qualityProblem").change(function () {
/***
* 2 是 ‘未知’， 1 是 ‘是’， 3 是 ‘否’, 0 是 ‘请选择’
*/
if( $("#qualityProblem").val() == 2 ){
$(".qualityProblemUnknow").show().find('select').val("");
$(".qualityProblemYes").hide().find('select').val("");
} else if($("#qualityProblem").val() == 1){
$(".qualityProblemYes").show().find('select').val("");
$(".qualityProblemUnknow").hide().find('select').val("");
$(".technologyNoticeYes").hide().find('select').val("");
$(".technologyNoticeNo").hide().find('select').val("");
} else {
$(".qualityProblemUnknow").hide().find('select').val("");
$(".qualityProblemYes").hide().find('select').val("");
}
})
/**
* 是否有技术公告 1 : 是 2 : 否
* */
$("#technologyNotice").change(function () {
if( $("#technologyNotice").val() == 1 ){
$(".technologyNoticeYes").show().find('select').val("");
$(".technologyNoticeNo").hide().find('select').val("");
$(".effectiveProblemYes").hide().find('select').val("");
$('.effectiveProblemNo').hide().find('select').val("");
} else if( $("#technologyNotice").val() == 2 ){
$(".technologyNoticeYes").hide().find('select').val("");
$(".technologyNoticeNo").show().find('select').val("");
$(".effectiveProblemYes").hide().find('select').val("");
$('.effectiveProblemNo').hide().find('select').val("");
} else {
$(".technologyNoticeYes").hide().find('select').val("");
$(".technologyNoticeNo").hide().find('select').val("");
}
})
/**
* 是否有效 1 : 是 2 : 否
* */
$("#effectiveProblem").change(function () {
if($("#effectiveProblem").val() == 1){
$('.effectiveProblemYes').show().find('select').val("");
$(".effectiveProblemNo").hide().find('select').val("");
}else if($("#effectiveProblem").val() == 2){
$('.effectiveProblemYes').hide().find('select').val("");
$(".effectiveProblemNo").show().find('select').val("");
}else {
$('.effectiveProblemYes').hide().find('select').val("");
$(".effectiveProblemNo").hide().find('select').val("");
}
})
/**
* 维修 选择 1 : 搭电 , 2 : 打气 ， 3 ： 换胎 ， 4 ： 解档 ， 5 ：安装 ， 6 ： 其他处理
* */
$('#repairOptions').change(function () {
if( $('#repairOptions').val() == 1 ){
$("#betteryCheck").show();
$("#writeParts").hide();
$("#repairDescirbe").hide();
} else if( $('#repairOptions').val() == 5 ){
$("#betteryCheck").hide();
$("#writeParts").show();
$("#repairDescirbe").hide();
} else if( $('#repairOptions').val() == 6 ){
$("#betteryCheck").hide();
$("#writeParts").hide();
$("#repairDescirbe").show();
} else {
$("#betteryCheck").hide();
$("#writeParts").hide();
$("#repairDescirbe").hide();
}
})
/**
* 进店维修
* */
/**
* 是否有工单号 1 : 是 ， 2 ： 否
* */
$('#repairEnterCompanyOrderNumber').change(function () {
if($('#repairEnterCompanyOrderNumber').val() == 1){
$('#HasRepairOrderNumber').show();
$('#HasNotRepairOrderNumber').hide();
} else if($('#repairEnterCompanyOrderNumber').val() == 2){
$('#HasRepairOrderNumber').hide();
$('#HasNotRepairOrderNumber').show();
} else {
$('#HasRepairOrderNumber').hide();
$('#HasNotRepairOrderNumber').hide();
}
})
/**
* 维修选择框 1 ： 已修复 ， 2 ： 正在维修 ， 3 ： 等待维修授权 ， 4 ：问题未再现 ， 5 ： 其他
* */
$('#repairEnterCompany').change(function () {
if( $('#repairEnterCompany').val() == 5 ){
$("#repairEnterCompanyOtherDetail").show();
}else {
$("#repairEnterCompanyOtherDetail").hide();
}
})
/**
* 是否质量问题 1 ： 是 ， 2 ： 否 ， 3 : 未知
* */
$("#repairEnterCompanyQuality").change(function () {
// 选择 是
if($("#repairEnterCompanyQuality").val() == 1 ){
$(".repairEnterCompanyQualityNo").hide().find('select').val("");
$('.repairEnterCompanyQualityYes').show().find('select').val("");
$(".repairEnterCompanyQualityUnknow").hide().find('select').val("");
$(".repairEnterCompanyTechnologyYes").hide().find('select').val("");
$(".repairEnterCompanyTechnologyNo").hide().find('select').val("");
} else if($("#repairEnterCompanyQuality").val() == 2){
$(".repairEnterCompanyQualityNo").show().find('select').val("");
$('.repairEnterCompanyQualityYes').hide().find('select').val("");
$(".repairEnterCompanyQualityUnknow").hide().find('select').val("");
} else if($("#repairEnterCompanyQuality").val() == 3){
$(".repairEnterCompanyQualityNo").hide().find('select').val("");
$('.repairEnterCompanyQualityYes').hide().find('select').val("");
$(".repairEnterCompanyQualityUnknow").show().find('select').val("");
} else {
$(".repairEnterCompanyQualityNo").hide().find('select').val("");
$('.repairEnterCompanyQualityYes').hide().find('select').val("");
$(".repairEnterCompanyQualityUnknow").hide().find('select').val("");
}
})
/**
* 是否有技术公告 1 : 是 ， 2 ： 否
* */
$('#repairEnterCompanyTechnologyNotice').change(function () {
if( $('#repairEnterCompanyTechnologyNotice').val() == 1 ){
$('.repairEnterCompanyTechnologyYes').show().find('select').val("");
$('.repairEnterCompanyTechnologyNo').hide().find('select').val("");
$('.repairEnterEffectiveYes').hide().find('select').val("");
$('.repairEnterEffectiveNo').hide().find('select').val("");
}else if($('#repairEnterCompanyTechnologyNotice').val() == 2) {
$('.repairEnterCompanyTechnologyYes').hide().find('select').val("");
$('.repairEnterCompanyTechnologyNo').show().find('select').val("");
}else {
$('.repairEnterCompanyTechnologyYes').hide().find('select').val("");
$('.repairEnterCompanyTechnologyNo').hide().find('select').val("");
}
})
/**
* 是否有效 1 ： 是 ， 2 ： 否
* */
$('#repairEnterCompanyEffectiveProblem').change(function () {
if($('#repairEnterCompanyEffectiveProblem').val() == 1){
$('.repairEnterEffectiveYes').show().find('select').val("");
$('.repairEnterEffectiveNo').hide().find('select').val("");
} else if($('#repairEnterCompanyEffectiveProblem').val() == 2) {
$('.repairEnterEffectiveYes').hide().find('select').val("");
$('.repairEnterEffectiveNo').show().find('select').val("");
} else {
$('.repairEnterEffectiveYes').hide().find('select').val("");
$('.repairEnterEffectiveNo').hide().find('select').val("");
}
})
function submitMyInfo() { function submitMyInfo() {
var path = $("#mypaths").val(); var path = $("#mypaths").val();
var newPassword = $("#newPassword").val(); var newPassword = $("#newPassword").val();