Skip to content

S
shuniu-admin-react
Commit 3055db68 authored by superman's avatar superman
Browse files
Options

update

parent bad46fae
Show whitespace changes
Inline Side-by-side
Showing with 572 additions and 406 deletions
.idea/workspace.xml
View file @ 3055db68
...@@ -2,30 +2,13 @@ ...@@ -2,30 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ec208c71-5ff8-4642-a786-fad4f24be9b8" name="Default" comment=""> <list default="true" id="ec208c71-5ff8-4642-a786-fad4f24be9b8" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/containers/Users/EditItem.jsx" />
<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$/dist/index.css" afterPath="$PROJECT_DIR$/dist/index.css" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx" afterPath="$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/dist/index.js" afterPath="$PROJECT_DIR$/dist/index.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx" afterPath="$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/proxy.config.js" afterPath="$PROJECT_DIR$/proxy.config.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx" afterPath="$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/Layout/Layout.less" afterPath="$PROJECT_DIR$/src/components/Layout/Layout.less" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/MainHeader/MainHeader.jsx" afterPath="$PROJECT_DIR$/src/components/MainHeader/MainHeader.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/MainHeader/MainHeader.less" afterPath="$PROJECT_DIR$/src/components/MainHeader/MainHeader.less" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Announcement/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Announcement/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/App/App.jsx" afterPath="$PROJECT_DIR$/src/containers/App/App.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Product/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Product/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" afterPath="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/Users/List.jsx" afterPath="$PROJECT_DIR$/src/containers/Users/List.jsx" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/containers/index.js" afterPath="$PROJECT_DIR$/src/containers/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/entries/index.less" afterPath="$PROJECT_DIR$/src/entries/index.less" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/reducers/announcement.js" afterPath="$PROJECT_DIR$/src/reducers/announcement.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/reducers/user.js" afterPath="$PROJECT_DIR$/src/reducers/user.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/index.js" afterPath="$PROJECT_DIR$/src/routes/index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/sagas/announcement.js" afterPath="$PROJECT_DIR$/src/sagas/announcement.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/sagas/user.js" afterPath="$PROJECT_DIR$/src/sagas/user.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/services/user.js" afterPath="$PROJECT_DIR$/src/services/user.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/services/xFetch.js" afterPath="$PROJECT_DIR$/src/services/xFetch.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils.js" afterPath="$PROJECT_DIR$/src/utils.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils.js" afterPath="$PROJECT_DIR$/src/utils.js" />
</list> </list>
<ignored path="shuniu-admin.iws" /> <ignored path="shuniu-admin.iws" />
...@@ -52,18 +35,18 @@ ...@@ -52,18 +35,18 @@
<file leaf-file-name="utils.js" pinned="false" current-in-tab="false"> <file leaf-file-name="utils.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils.js"> <entry file="file://$PROJECT_DIR$/src/utils.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249"> <state relative-caret-position="30">
<caret line="148" column="37" selection-start-line="148" selection-start-column="4" selection-end-line="148" selection-end-column="37" /> <caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PassItem.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name="ShouyiYongjingForm.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx"> <entry file="file://$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429"> <state relative-caret-position="612">
<caret line="117" column="10" selection-start-line="97" selection-start-column="8" selection-end-line="117" selection-end-column="10" /> <caret line="208" column="33" selection-start-line="208" selection-start-column="33" selection-end-line="208" selection-end-column="33" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
...@@ -71,21 +54,11 @@ ...@@ -71,21 +54,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="withdraw.js" pinned="false" current-in-tab="false"> <file leaf-file-name="HuikuanInfoForm.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/reducers/withdraw.js"> <entry file="file://$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="417">
<caret line="29" column="9" selection-start-line="29" selection-start-column="9" selection-end-line="29" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BaseInfoForm.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="165">
<caret line="161" column="32" selection-start-line="154" selection-start-column="24" selection-end-line="161" selection-end-column="32" /> <caret line="51" column="63" selection-start-line="51" selection-start-column="46" selection-end-line="51" selection-end-column="63" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
...@@ -93,11 +66,11 @@ ...@@ -93,11 +66,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EditItem.jsx" pinned="false" current-in-tab="true"> <file leaf-file-name="Layout.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx"> <entry file="file://$PROJECT_DIR$/src/components/Layout/Layout.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-18"> <state relative-caret-position="0">
<caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="50" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
...@@ -105,45 +78,48 @@ ...@@ -105,45 +78,48 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="product.js" pinned="false" current-in-tab="false"> <file leaf-file-name="PassItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/sagas/product.js"> <entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1323"> <state relative-caret-position="216">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="198" column="91" selection-start-line="198" selection-start-column="68" selection-end-line="198" selection-end-column="91" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="product.js" pinned="false" current-in-tab="false"> <file leaf-file-name="BaseInfoForm.jsx" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/reducers/product.js"> <entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522"> <state relative-caret-position="447">
<caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" /> <caret line="374" column="30" selection-start-line="374" selection-start-column="30" selection-end-line="374" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#44#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
<element signature="e#3521#9634#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="proxy.config.js" pinned="false" current-in-tab="false"> <file leaf-file-name="AddItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/proxy.config.js"> <entry file="file://$PROJECT_DIR$/src/containers/Product/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="282">
<caret line="6" column="2" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" /> <caret line="150" column="82" selection-start-line="150" selection-start-column="82" selection-end-line="150" selection-end-column="82" />
<folding /> <folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EditItem.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name="EditItem.jsx" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Users/EditItem.jsx"> <entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-615"> <state relative-caret-position="432">
<caret line="87" column="29" selection-start-line="87" selection-start-column="29" selection-end-line="87" selection-end-column="29" /> <caret line="120" column="128" selection-start-line="120" selection-start-column="128" selection-end-line="120" selection-end-column="128" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
...@@ -151,12 +127,14 @@ ...@@ -151,12 +127,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EditItem.jsx" pinned="false" current-in-tab="false"> <file leaf-file-name="product.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx"> <entry file="file://$PROJECT_DIR$/src/reducers/product.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-468"> <state relative-caret-position="522">
<caret line="80" column="107" selection-start-line="79" selection-start-column="24" selection-end-line="80" selection-end-column="107" /> <caret line="50" column="16" selection-start-line="50" selection-start-column="16" selection-end-line="50" selection-end-column="16" />
<folding /> <folding>
<element signature="e#0#44#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -174,11 +152,9 @@ ...@@ -174,11 +152,9 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/reducers/__tests__/todos-test.js" />
<option value="$PROJECT_DIR$/src/reducers/costomMessage.js" /> <option value="$PROJECT_DIR$/src/reducers/costomMessage.js" />
<option value="$PROJECT_DIR$/src/services/customMessage.js" /> <option value="$PROJECT_DIR$/src/services/customMessage.js" />
<option value="$PROJECT_DIR$/src/sagas/customMessage.js" /> <option value="$PROJECT_DIR$/src/sagas/customMessage.js" />
<option value="$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx" />
<option value="$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx" /> <option value="$PROJECT_DIR$/src/containers/CustomMessage/Item.jsx" />
<option value="$PROJECT_DIR$/src/containers/Trade/Item.jsx" /> <option value="$PROJECT_DIR$/src/containers/Trade/Item.jsx" />
<option value="$PROJECT_DIR$/src/components/CopyToClipboard.jsx" /> <option value="$PROJECT_DIR$/src/components/CopyToClipboard.jsx" />
...@@ -187,9 +163,7 @@ ...@@ -187,9 +163,7 @@
<option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.less" /> <option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.less" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" /> <option value="$PROJECT_DIR$/src/containers/BaseFunction/BaseUpload.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/reducers/product.js" /> <option value="$PROJECT_DIR$/src/reducers/product.js" />
<option value="$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx" />
<option value="$PROJECT_DIR$/src/components/MainHeader.jsx" /> <option value="$PROJECT_DIR$/src/components/MainHeader.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/List.jsx" /> <option value="$PROJECT_DIR$/src/containers/Remittance/List.jsx" />
<option value="$PROJECT_DIR$/src/variable.less" /> <option value="$PROJECT_DIR$/src/variable.less" />
...@@ -198,7 +172,6 @@ ...@@ -198,7 +172,6 @@
<option value="$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/CustomMessage/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Trade/AddItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Trade/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Announcement/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/Product.less" /> <option value="$PROJECT_DIR$/src/containers/Product/Product.less" />
<option value="$PROJECT_DIR$/src/containers/Trade/List.jsx" /> <option value="$PROJECT_DIR$/src/containers/Trade/List.jsx" />
<option value="$PROJECT_DIR$/src/containers/Users/Additem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Users/Additem.jsx" />
...@@ -220,11 +193,16 @@ ...@@ -220,11 +193,16 @@
<option value="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx" />
<option value="$PROJECT_DIR$/src/sagas/announcement.js" /> <option value="$PROJECT_DIR$/src/sagas/announcement.js" />
<option value="$PROJECT_DIR$/src/reducers/announcement.js" /> <option value="$PROJECT_DIR$/src/reducers/announcement.js" />
<option value="$PROJECT_DIR$/src/utils.js" />
<option value="$PROJECT_DIR$/src/entries/index.less" /> <option value="$PROJECT_DIR$/src/entries/index.less" />
<option value="$PROJECT_DIR$/proxy.config.js" /> <option value="$PROJECT_DIR$/proxy.config.js" />
<option value="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" /> <option value="$PROJECT_DIR$/src/containers/Product/EditItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx" />
<option value="$PROJECT_DIR$/src/containers/Product/AddItem.jsx" />
<option value="$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx" />
<option value="$PROJECT_DIR$/src/utils.js" />
<option value="$PROJECT_DIR$/src/components/FormItem/FormItem.jsx" />
<option value="$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx" />
<option value="$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx" />
</list> </list>
</option> </option>
</component> </component>
...@@ -597,28 +575,6 @@ ...@@ -597,28 +575,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="MainHeader" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="shuniu-admin" /> <option name="myItemId" value="shuniu-admin" />
...@@ -1132,12 +1088,12 @@ ...@@ -1132,12 +1088,12 @@
<workItem from="1468394206076" duration="1879000" /> <workItem from="1468394206076" duration="1879000" />
<workItem from="1468396235889" duration="33823000" /> <workItem from="1468396235889" duration="33823000" />
<workItem from="1468540294765" duration="94258000" /> <workItem from="1468540294765" duration="94258000" />
<workItem from="1468995021353" duration="188124000" /> <workItem from="1468995021353" duration="195783000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="318084000" /> <option name="totallyTimeSpent" value="325743000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -1150,7 +1106,7 @@ ...@@ -1150,7 +1106,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1280" height="800" extended-state="0" /> <frame x="0" y="0" width="1280" height="800" extended-state="0" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Palette" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329235" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329235" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
...@@ -1160,7 +1116,7 @@ ...@@ -1160,7 +1116,7 @@
<window_info id="Maven Projects" 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="4" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" 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="4" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" 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="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" 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="7" 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.33" sideWeight="0.5" 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.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32739726" sideWeight="0.5" order="7" 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.32739726" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Tool" 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="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" 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="3" side_tool="false" content_ui="tabs" /> <window_info id="Designer" 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="3" 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.24071082" sideWeight="0.5" 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.24071082" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -1222,52 +1178,6 @@ ...@@ -1222,52 +1178,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/DateTimeStatusForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="192">
<caret line="44" column="58" selection-start-line="44" selection-start-column="8" selection-end-line="44" selection-end-column="58" />
<folding>
<element signature="e#0#50#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="154" column="114" selection-start-line="154" selection-start-column="114" selection-end-line="154" selection-end-column="114" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Layout/Layout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#50#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/antd/lib/table/Table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1140">
<caret line="0" column="0" 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$/node_modules/antd/lib/table/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" 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$/node_modules/antd/lib/table/style/index.less"> <entry file="file://$PROJECT_DIR$/node_modules/antd/lib/table/style/index.less">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
...@@ -1507,7 +1417,7 @@ ...@@ -1507,7 +1417,7 @@
<state relative-caret-position="255"> <state relative-caret-position="255">
<caret line="82" column="37" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" /> <caret line="82" column="37" selection-start-line="82" selection-start-column="37" selection-end-line="82" selection-end-column="37" />
<folding> <folding>
<element signature="e#0#38#0" expanded="true" /> <element signature="e#0#38#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -1596,14 +1506,6 @@ ...@@ -1596,14 +1506,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="249">
<caret line="148" column="37" selection-start-line="148" selection-start-column="4" selection-end-line="148" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx"> <entry file="file://$PROJECT_DIR$/src/containers/Announcement/EditItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-468"> <state relative-caret-position="-468">
...@@ -1622,16 +1524,6 @@ ...@@ -1622,16 +1524,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="161" column="32" selection-start-line="154" selection-start-column="24" selection-end-line="161" selection-end-column="32" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/proxy.config.js"> <entry file="file://$PROJECT_DIR$/proxy.config.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
...@@ -1660,22 +1552,89 @@ ...@@ -1660,22 +1552,89 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="120" column="128" selection-start-line="120" selection-start-column="128" selection-end-line="120" selection-end-column="128" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx"> <entry file="file://$PROJECT_DIR$/src/containers/Remittance/PassItem.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="429"> <state relative-caret-position="216">
<caret line="117" column="10" selection-start-line="97" selection-start-column="8" selection-end-line="117" selection-end-column="10" /> <caret line="198" column="91" selection-start-line="198" selection-start-column="68" selection-end-line="198" selection-end-column="91" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/containers/Product/EditItem.jsx"> <entry file="file://$PROJECT_DIR$/src/containers/Product/AddItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="282">
<caret line="150" column="82" selection-start-line="150" selection-start-column="82" selection-end-line="150" selection-end-column="82" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/ShouyiYongjingForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="612">
<caret line="208" column="33" selection-start-line="208" selection-start-column="33" selection-end-line="208" selection-end-column="33" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="4" column="32" selection-start-line="4" selection-start-column="32" selection-end-line="4" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Layout/Layout.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="50" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/FormItem/FormItem.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="36" selection-start-line="11" selection-start-column="36" selection-end-line="11" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/HuikuanInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="51" column="63" selection-start-line="51" selection-start-column="46" selection-end-line="51" selection-end-column="63" />
<folding>
<element signature="e#0#50#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/ProductForm/BaseInfoForm.jsx">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-18"> <state relative-caret-position="447">
<caret line="95" column="0" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" /> <caret line="374" column="30" selection-start-line="374" selection-start-column="30" selection-end-line="374" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#50#0" expanded="true" /> <element signature="e#0#50#0" expanded="true" />
<element signature="e#3521#9634#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
src/components/ProductForm/BaseInfoForm.jsx
View file @ 3055db68
...@@ -21,11 +21,12 @@ import { ...@@ -21,11 +21,12 @@ import {
} from 'antd'; } from 'antd';
import { import {
UUID, UUID, NULL,
formItemLayout, formItemLayout,
smallFormItemLayout, smallFormItemLayout,
footerFormSubmitLayout, footerFormSubmitLayout,
handleUpload handleUpload,
leftRightFormItemLayout
} from '../../utils'; } from '../../utils';
...@@ -49,8 +50,17 @@ export default class BaseInfoForm extends Component { ...@@ -49,8 +50,17 @@ export default class BaseInfoForm extends Component {
}; };
} }
componentWillMount() { componentDidMount() {
const {itemPic} = this.props.product;
this.updateStateOfNextProps(this.props);
}
componentWillReceiveProps(nextProps) {
this.updateStateOfNextProps(nextProps);
}
updateStateOfNextProps(props) {
const {product:{itemPic}} = props;
if (itemPic) { if (itemPic) {
this.setState({ this.setState({
...@@ -92,50 +102,110 @@ export default class BaseInfoForm extends Component { ...@@ -92,50 +102,110 @@ export default class BaseInfoForm extends Component {
}; };
render() { render() {
const {user, cates, product, loading, form:{getFieldProps}} = this.props; const {user, cates, product, loading, form:{getFieldProps}, isEdit} = this.props;
let productCate = []; let productCate = [];
if (product && product.categoryId && product.categoryParentId) { if (product && product.categoryId && product.categoryParentId) {
if (isEdit) {
productCate = [product.categoryParentId, product.categoryId]; productCate = [product.categoryParentId, product.categoryId];
} else if (cates && cates.length) {
cates.forEach(cate=> {
if (cate.value == product.categoryParentId) {
productCate.push(cate.label);
cate.children.forEach(child=> {
if (child.value == product.categoryId) {
productCate.push(child.label);
}
});
}
});
}
}
const imgProps = (src)=>({
src: src + '!t',
style: {maxWidth: 200, maxHeight: 160},
onClick: e => {
e.preventDefault();
this.setState({
priviewVisible: true,
priviewImage: src
});
} }
});
return ( return (
<Spin spinning={loading}> <Spin spinning={loading}>
<Form horizontal onSubmit={this.handleSubmit.bind(this)}> <Form horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item label="产品类目" {...smallFormItemLayout}> <Row style={{padding:'0 20px'}}>
<Col span="12">
<Form.Item label="产品类目" {...leftRightFormItemLayout}>
{ {
cates && cates && (
isEdit ?
<Cascader options={cates} placeholder="请选产品类目" <Cascader options={cates} placeholder="请选产品类目"
{...getFieldProps('categoryId', { {...getFieldProps('categoryId', {
initialValue: productCate initialValue: productCate
})} })}
/> />
:
(productCate.length ? productCate.join(' / ') : NULL)
)
} }
</Form.Item> </Form.Item>
<Form.Item label="产品短标题" {...smallFormItemLayout}> <Form.Item label="产品短标题" {...leftRightFormItemLayout}>
{
isEdit ?
<Input placeholder="产品短标题" <Input placeholder="产品短标题"
{...getFieldProps('itemShortTitle', { {...getFieldProps('itemShortTitle', {
initialValue: product.itemShortTitle, initialValue: product.itemShortTitle,
})} })}
/> />
:
product.itemShortTitle || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="产品标题" {...formItemLayout}> <Form.Item label="产品标题" {...leftRightFormItemLayout}>
{
isEdit ?
<Input placeholder="产品标题" <Input placeholder="产品标题"
{...getFieldProps('itemTitle', { {...getFieldProps('itemTitle', {
initialValue: product.itemTitle initialValue: product.itemTitle
})} })}
/> />
:
product.itemTitle || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="产品简介" {...formItemLayout}> <Form.Item label="产品简介" {...leftRightFormItemLayout}>
{
isEdit ?
<Input type="textarea" autosize={{minRows:5, maxRows:20}} placeholder="产品简介" <Input type="textarea" autosize={{minRows:5, maxRows:20}} placeholder="产品简介"
{...getFieldProps('summary', { {...getFieldProps('summary', {
initialValue: product.summary initialValue: product.summary
})} })}
/> />
:
(
product.summary ?
<p style={{maxWidth:300, lineHeight:1.732}}>
{product.summary}
</p>
:
NULL
)
}
</Form.Item> </Form.Item>
<Form.Item label="产品主图" {...formItemLayout}> <Form.Item label="产品主图" {...leftRightFormItemLayout}>
{
isEdit ?
<Upload action="/api/fileUpload/upload" listType="picture-card" <Upload action="/api/fileUpload/upload" listType="picture-card"
multiple={true} multiple={true}
headers={{ headers={{
...@@ -152,6 +222,10 @@ export default class BaseInfoForm extends Component { ...@@ -152,6 +222,10 @@ export default class BaseInfoForm extends Component {
<Icon type="upload"/> <Icon type="upload"/>
<div className="ant-upload-text">上传照片</div> <div className="ant-upload-text">上传照片</div>
</Upload> </Upload>
:
(product.itemPic ? <img {...imgProps(product.itemPic)} /> : NULL)
}
<Modal footer={null} <Modal footer={null}
width="100vw" width="100vw"
visible={this.state.priviewVisible} visible={this.state.priviewVisible}
...@@ -161,27 +235,58 @@ export default class BaseInfoForm extends Component { ...@@ -161,27 +235,58 @@ export default class BaseInfoForm extends Component {
<img src={this.state.priviewImage} style={{maxWidth:'100%'}}/> <img src={this.state.priviewImage} style={{maxWidth:'100%'}}/>
</Modal> </Modal>
</Form.Item> </Form.Item>
<Form.Item label="募集目标" help="本期额度, 可以输入100万, 2亿等" {...smallFormItemLayout}> <Form.Item wrapperCol={{span: 16, offset: 6}} style={{marginTop:30}}>
<Button type="primary" htmlType="submit" loading={loading}><Icon
type="save"/>保存</Button>
{
!this.props.isCreate &&
<Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}
style={{marginLeft:'1em'}}>
<Icon type="rollback"/>返回
</Button>
}
</Form.Item>
</Col>
<Col span="12">
<Form.Item label="募集目标" help={ isEdit && "本期额度, 可以输入100万, 2亿等"}
{...leftRightFormItemLayout}>
{
isEdit ?
<Input placeholder="募集目标" <Input placeholder="募集目标"
{...getFieldProps('fundRaisedTarget', { {...getFieldProps('fundRaisedTarget', {
initialValue: product.fundRaisedTarget initialValue: product.fundRaisedTarget
})} })}
/> />
:
product.fundRaisedTarget || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="产品期限" help="例如:半年期" {...smallFormItemLayout}> <Form.Item label="产品期限" help={isEdit && "例如:半年期"} {...leftRightFormItemLayout}>
{
isEdit ?
<Input placeholder="" {...getFieldProps('duration', { <Input placeholder="" {...getFieldProps('duration', {
initialValue: product.duration initialValue: product.duration
})} /> })} />
:
product.duration || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="起投金额" help="最小购买份额" {...smallFormItemLayout}> <Form.Item label="起投金额" help={isEdit && "最小购买份额"} {...leftRightFormItemLayout}>
{
isEdit ?
<Input placeholder="" <Input placeholder=""
{...getFieldProps('minimumAmount', { {...getFieldProps('minimumAmount', {
initialValue: product.minimumAmount initialValue: product.minimumAmount
})} })}
/> />
:
product.minimumAmount || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="已预约" help="此处的已预约只用于显示" {...smallFormItemLayout} > <Form.Item label="已预约" help={isEdit && "此处的已预约只用于显示"} {...leftRightFormItemLayout} >
{ {
isEdit ?
(
((typeof product.fundReservationOver !== 'undefined') && ( product.fundReservationOver !== '')) ? ((typeof product.fundReservationOver !== 'undefined') && ( product.fundReservationOver !== '')) ?
<div style={{maxWidth:500}}> <div style={{maxWidth:500}}>
<Input addonAfter={"实际:"+ product.fundReservationOver} <Input addonAfter={"实际:"+ product.fundReservationOver}
...@@ -196,12 +301,25 @@ export default class BaseInfoForm extends Component { ...@@ -196,12 +301,25 @@ export default class BaseInfoForm extends Component {
initialValue: product.fundReservationOverFake initialValue: product.fundReservationOverFake
})} })}
/> />
)
:
<div>
{
product.fundReservationOverFake ? "显示: " + product.fundReservationOverFake : NULL
} }
{
product.fundReservationOver &&
<span
style={{marginLeft:'2em'}}>{" 实际: " + product.fundReservationOver}</span>
}
</div>
}
</Form.Item> </Form.Item>
<Form.Item label="已募集" help="此处的已募集只用于显示" {...smallFormItemLayout}> <Form.Item label="已募集" help={isEdit && "此处的已募集只用于显示"} {...leftRightFormItemLayout}>
{ {
((typeof product.fundRaisedOver !== 'undefined') && (product.fundRaisedOver !== '')) ? isEdit ?
(((typeof product.fundRaisedOver !== 'undefined') && (product.fundRaisedOver !== '')) ?
<div style={{maxWidth:500}}> <div style={{maxWidth:500}}>
<Input addonAfter={"实际:"+ product.fundRaisedOver} <Input addonAfter={"实际:"+ product.fundRaisedOver}
{...getFieldProps('fundRaisedOverFake', { {...getFieldProps('fundRaisedOverFake', {
...@@ -214,33 +332,48 @@ export default class BaseInfoForm extends Component { ...@@ -214,33 +332,48 @@ export default class BaseInfoForm extends Component {
{...getFieldProps('fundRaisedOverFake', { {...getFieldProps('fundRaisedOverFake', {
initialValue: product.fundRaisedOverFake initialValue: product.fundRaisedOverFake
})} })}
/> />)
:
<div>
{
product.fundRaisedOverFake ? "显示: " + product.fundRaisedOverFake : NULL
}
{
product.fundReservationOver &&
<span
style={{marginLeft:'2em'}}>{" 实际: " + product.fundRaisedOverFake}</span>
}
</div>
} }
</Form.Item> </Form.Item>
<Form.Item label="产品所属公司" {...smallFormItemLayout} > <Form.Item label="产品所属公司" {...leftRightFormItemLayout} >
{
isEdit ?
<Input placeholder="产品所属公司" <Input placeholder="产品所属公司"
{...getFieldProps('company', { {...getFieldProps('company', {
initialValue: product.company initialValue: product.company
})} })}
/> />
:
product.company || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="所属公司网址" {...smallFormItemLayout}> <Form.Item label="所属公司网址" {...leftRightFormItemLayout}>
{
isEdit ?
<Input placeholder="所属公司网址" <Input placeholder="所属公司网址"
{...getFieldProps('website', { {...getFieldProps('website', {
initialValue: product.website initialValue: product.website
})} })}
/> />
</Form.Item> :
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}> product.website || NULL
<Button type="primary" htmlType="submit" loading={loading}><Icon type="save"/>保存</Button>
{
!this.props.isCreate &&
<Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}
style={{marginLeft:'1em'}}>
<Icon type="rollback"/>返回
</Button>
} }
</Form.Item> </Form.Item>
</Col>
</Row>
</Form> </Form>
</Spin> </Spin>
); );
......
src/components/ProductForm/HuikuanInfoForm.jsx
View file @ 3055db68
...@@ -20,7 +20,8 @@ import { ...@@ -20,7 +20,8 @@ import {
Spin Spin
} from 'antd'; } from 'antd';
import {arrayRemoveIndex, UUID, formItemLayout, smallFormItemLayout, footerFormSubmitLayout} from '../../utils';
import {arrayRemoveIndex, NULL, UUID, formItemLayout, smallFormItemLayout, footerFormSubmitLayout} from '../../utils';
@Form.create() @Form.create()
export default class HuikuanInfoForm extends Component { export default class HuikuanInfoForm extends Component {
...@@ -48,38 +49,63 @@ export default class HuikuanInfoForm extends Component { ...@@ -48,38 +49,63 @@ export default class HuikuanInfoForm extends Component {
render() { render() {
const {form:{getFieldProps}, product:{fundRaisedAccount}, loading} = this.props; const {form:{getFieldProps}, product:{fundRaisedAccount}, loading, isEdit} = this.props;
return ( return (
<Spin spinning={loading}> <Spin spinning={loading}>
<Form horizontal onSubmit={this.handleSubmit.bind(this)}> <Form horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item label="名称" help="接收打款帐户名称" {...smallFormItemLayout} >
<Form.Item label="名称" help={isEdit && "接收打款帐户名称"} {...smallFormItemLayout} >
{
isEdit ?
<Input placeholder="名称" <Input placeholder="名称"
{...getFieldProps('fundRaisedAccount.name', { {...getFieldProps('fundRaisedAccount.name', {
initialValue: fundRaisedAccount.name initialValue: fundRaisedAccount.name
})} })}
/> />
:
fundRaisedAccount.name || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="银行帐号" help="接收打款银行帐号" {...smallFormItemLayout}> <Form.Item label="银行帐号" help={isEdit && "接收打款银行帐号"} {...smallFormItemLayout}>
{
isEdit ?
<Input placeholder="银行帐号" <Input placeholder="银行帐号"
{...getFieldProps('fundRaisedAccount.number', { {...getFieldProps('fundRaisedAccount.number', {
initialValue: fundRaisedAccount.number initialValue: fundRaisedAccount.number
})} })}
/> />
:
fundRaisedAccount.number || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="开户行" help="接收打款银行开户行" {...formItemLayout}> <Form.Item label="开户行" help={isEdit &&"接收打款银行开户行"} {...formItemLayout}>
{
isEdit ?
<Input placeholder="开户行" <Input placeholder="开户行"
{...getFieldProps('fundRaisedAccount.bank', { {...getFieldProps('fundRaisedAccount.bank', {
initialValue: fundRaisedAccount.bank initialValue: fundRaisedAccount.bank
})} })}
/> />
:
fundRaisedAccount.bank || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="打款须知" help="接收打款的一些必要告知信息" {...formItemLayout}> <Form.Item label="打款须知" help={ isEdit && "接收打款的一些必要告知信息"} {...formItemLayout}>
{
isEdit ?
<Input type="textarea" autosize={{minRows:5, maxRows:20}} placeholder="" <Input type="textarea" autosize={{minRows:5, maxRows:20}} placeholder=""
{...getFieldProps('fundRaisedAccount.memo', { {...getFieldProps('fundRaisedAccount.memo', {
initialValue: fundRaisedAccount.memo initialValue: fundRaisedAccount.memo
})} })}
/> />
:
fundRaisedAccount.memo || NULL
}
</Form.Item> </Form.Item>
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}> <Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
<Button type="primary" htmlType="submit" loading={loading}><Icon type="save"/>保存</Button> <Button type="primary" htmlType="submit" loading={loading}><Icon type="save"/>保存</Button>
...@@ -87,7 +113,7 @@ export default class HuikuanInfoForm extends Component { ...@@ -87,7 +113,7 @@ export default class HuikuanInfoForm extends Component {
!this.props.isCreate && !this.props.isCreate &&
<Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}} <Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}
style={{marginLeft:'1em'}}> style={{marginLeft:'1em'}}>
<Icon type="rollback" />返回 <Icon type="rollback"/>返回
</Button> </Button>
} }
</Form.Item> </Form.Item>
......
src/components/ProductForm/ShouyiYongjingForm.jsx
View file @ 3055db68
...@@ -21,7 +21,7 @@ import { ...@@ -21,7 +21,7 @@ import {
} from 'antd'; } from 'antd';
import {arrayRemoveIndex, UUID, formItemLayout, smallFormItemLayout, footerFormSubmitLayout} from '../../utils'; import {arrayRemoveIndex, NULL, UUID, formItemLayout, smallFormItemLayout, footerFormSubmitLayout} from '../../utils';
export function YongjingTransform(arr) { export function YongjingTransform(arr) {
...@@ -88,11 +88,11 @@ export default class ShouyiYongjingForm extends Component { ...@@ -88,11 +88,11 @@ export default class ShouyiYongjingForm extends Component {
if (/^[\d]+$/g.test(key)) { if (/^[\d]+$/g.test(key)) {
const d = formData[key]; const d = formData[key];
commissionAlg.push({ commissionAlg.push({
min:d.min, min: d.min,
max:d.max, max: d.max,
result:{ result: {
yj:d.yj, yj: d.yj,
sy:d.sy sy: d.sy
} }
}); });
} else { } else {
...@@ -112,26 +112,41 @@ export default class ShouyiYongjingForm extends Component { ...@@ -112,26 +112,41 @@ export default class ShouyiYongjingForm extends Component {
render() { render() {
const {form:{getFieldProps}, product, loading} = this.props; const {form:{getFieldProps}, product, loading, isEdit} = this.props;
return ( return (
<Spin spinning={loading}> <Spin spinning={loading}>
<Form horizontal onSubmit={this.handleSubmit.bind(this)}> <Form horizontal onSubmit={this.handleSubmit.bind(this)}>
<Form.Item label="佣金结算方式" help="例如: 打款结佣、成立结佣" {...smallFormItemLayout}> <Form.Item label="佣金结算方式" help={isEdit && "例如: 打款结佣、成立结佣"} {...smallFormItemLayout}>
{
isEdit ?
<Input placeholder="佣金结算方式" <Input placeholder="佣金结算方式"
{...getFieldProps('settlement', { {...getFieldProps('settlement', {
initialValue: product.settlement initialValue: product.settlement
})} })}
/> />
:
product.settlement || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="产品的预期收益" help="浮动或百分比" {...smallFormItemLayout}> <Form.Item label="产品的预期收益" help={isEdit && "浮动或百分比"} {...smallFormItemLayout}>
{
isEdit ?
<Input placeholder="产品的预期收益" <Input placeholder="产品的预期收益"
{...getFieldProps('productProspectiveReturn', { {...getFieldProps('productProspectiveReturn', {
initialValue: product.productProspectiveReturn initialValue: product.productProspectiveReturn
})} })}
/> />
:
product.productProspectiveReturn || NULL
}
</Form.Item> </Form.Item>
<Form.Item label="佣金算法" {...formItemLayout}> <Form.Item label="佣金算法" {...formItemLayout}>
{
isEdit ?
<div>
<Input.Group> <Input.Group>
<Col span="5" className="tac">最小投资额</Col> <Col span="5" className="tac">最小投资额</Col>
<Col span="5" className="tac">最大投资额</Col> <Col span="5" className="tac">最大投资额</Col>
...@@ -155,17 +170,44 @@ export default class ShouyiYongjingForm extends Component { ...@@ -155,17 +170,44 @@ export default class ShouyiYongjingForm extends Component {
<Input {...getFieldProps(index + '.yj', {initialValue: item.result && item.result.yj})}/> <Input {...getFieldProps(index + '.yj', {initialValue: item.result && item.result.yj})}/>
</Col> </Col>
<Col span="4"> <Col span="4">
<Icon type="cross" onClick={this.handleRemoveYongjin.bind(this, index)}/> <Icon type="cross"
onClick={this.handleRemoveYongjin.bind(this, index)}/>
</Col> </Col>
</Input.Group> </Input.Group>
</div> </div>
) )
} }
<Row style={{marginTop:15}}> </div>
<Col span="20" className="tac"> :
(
this.state.yongjing.length ?
<table>
<thead>
<tr>
<th className="tac">最小投资额</th>
<th className="tac">最大投资额</th>
<th className="tac">收益</th>
<th className="tac">佣金</th>
</tr>
</thead>
<tbody>
{
</Col> this.state.yongjing.map((item, index)=>
</Row> <tr key={item.key}>
<td>{item.min}</td>
<td>{item.max}</td>
<td>{item.result && item.result.sy}</td>
<td>{item.result && item.result.yj}</td>
</tr>
)
}
</tbody>
</table>
:
NULL
)
}
</Form.Item> </Form.Item>
<Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}> <Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>
<Button style={{marginRight:'1em'}} <Button style={{marginRight:'1em'}}
...@@ -176,7 +218,7 @@ export default class ShouyiYongjingForm extends Component { ...@@ -176,7 +218,7 @@ export default class ShouyiYongjingForm extends Component {
!this.props.isCreate && !this.props.isCreate &&
<Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}} <Button onClick={e=>{e.preventDefault(); this.props.history.goBack();}}
style={{marginLeft:'1em'}}> style={{marginLeft:'1em'}}>
<Icon type="rollback" />返回 <Icon type="rollback"/>返回
</Button> </Button>
} }
</Form.Item> </Form.Item>
......
src/containers/Product/AddItem.jsx
View file @ 3055db68
...@@ -148,7 +148,7 @@ export default class AddItem extends Component { ...@@ -148,7 +148,7 @@ export default class AddItem extends Component {
<Tabs className={styles.tabs} tabPosition="left"> <Tabs className={styles.tabs} tabPosition="left">
{ tabs.map(tp=> { tabs.map(tp=>
<Tabs.TabPane tab={tp.tab} key={tp.key}> <Tabs.TabPane tab={tp.tab} key={tp.key}>
{product && <tp.children {...this.props} /> } {product && <tp.children {...this.props} isEdit={true} /> }
</Tabs.TabPane> </Tabs.TabPane>
)} )}
</Tabs> </Tabs>
......
src/containers/Product/EditItem.jsx
View file @ 3055db68
...@@ -118,7 +118,7 @@ export default class EditItem extends Component { ...@@ -118,7 +118,7 @@ export default class EditItem extends Component {
</div> </div>
); );
const title = (product && product.itemShortTitle ? product.itemShortTitle + ' - ' : '') + '产品详情'; const title = (product && product.itemShortTitle ? product.itemShortTitle + ' - ' : '') + '产品详情' + (isEdit?' - 编辑中': '');
const header = (<MainHeader breadcrumb={['产品管理', '产品详情']} title={title} operation={operation}/>); const header = (<MainHeader breadcrumb={['产品管理', '产品详情']} title={title} operation={operation}/>);
......
src/containers/Remittance/PassItem.jsx
View file @ 3055db68
...@@ -28,7 +28,8 @@ import { ...@@ -28,7 +28,8 @@ import {
formItemLayout, formItemLayout,
smallFormItemLayout, smallFormItemLayout,
footerFormSubmitLayout, footerFormSubmitLayout,
remittanceAuditStatusToString remittanceAuditStatusToString,
leftRightFormItemLayout
} from '../../utils'; } from '../../utils';
@connect(state=>({ @connect(state=>({
...@@ -119,7 +120,7 @@ export default class PassItem extends Component { ...@@ -119,7 +120,7 @@ export default class PassItem extends Component {
const header = (<MainHeader breadcrumb={['审核管理', '报单审核','审核详情']} title={title} operation={operation}/>); const header = (<MainHeader breadcrumb={['审核管理', '报单审核','审核详情']} title={title} operation={operation}/>);
const filayout = {...formItemLayout, labelCol: {span: 6}};
const imgProps = (src)=>({ const imgProps = (src)=>({
src: src + '!t', src: src + '!t',
...@@ -142,60 +143,60 @@ export default class PassItem extends Component { ...@@ -142,60 +143,60 @@ export default class PassItem extends Component {
<Form className="main-form" horizontal> <Form className="main-form" horizontal>
<Row style={{padding:'0 20px'}}> <Row style={{padding:'0 20px'}}>
<Col span="12"> <Col span="12">
<Form.Item label="报单时间" {...filayout}> <Form.Item label="报单时间" {...leftRightFormItemLayout}>
{audit.dateCreated && formatDateTime(audit.dateCreated) || '错误的时间'} {audit.dateCreated && formatDateTime(audit.dateCreated) || '错误的时间'}
</Form.Item> </Form.Item>
<Form.Item label="产品募集情况" {...filayout}> <Form.Item label="产品募集情况" {...leftRightFormItemLayout}>
{'已募集:' + audit.fundRaisedOver + '、募集目标:' + audit.fundRaisedTarget} {'已募集:' + audit.fundRaisedOver + '、募集目标:' + audit.fundRaisedTarget}
</Form.Item> </Form.Item>
<Form.Item label="预约姓名" {...filayout}> <Form.Item label="预约姓名" {...leftRightFormItemLayout}>
{audit.buyerName} {audit.buyerName}
</Form.Item> </Form.Item>
<Form.Item label="预约金额" {...filayout}> <Form.Item label="预约金额" {...leftRightFormItemLayout}>
{audit.reservationAmount} {audit.reservationAmount}
</Form.Item> </Form.Item>
{ {
isEdit ? isEdit ?
<Form.Item label="实际入账金额" help="实际入账金额，请核对打款凭条" {...filayout}> <Form.Item label="实际入账金额" help="实际入账金额，请核对打款凭条" {...leftRightFormItemLayout}>
<Input placeholder="实际入账金额" <Input placeholder="实际入账金额"
{...getFieldProps('remittanceAmount', { {...getFieldProps('remittanceAmount', {
initialValue: audit.remittanceAmount initialValue: audit.remittanceAmount
})} /> })} />
</Form.Item> </Form.Item>
: :
<Form.Item label="实际入账金额" {...filayout}> <Form.Item label="实际入账金额" {...leftRightFormItemLayout}>
{audit.remittanceAmount} {audit.remittanceAmount}
</Form.Item> </Form.Item>
} }
{ {
isEdit ? isEdit ?
<Form.Item label="投资人姓名" help="真实的投资人姓名，请核对身份证照片上的姓名" {...filayout}> <Form.Item label="投资人姓名" help="真实的投资人姓名，请核对身份证照片上的姓名" {...leftRightFormItemLayout}>
<Input placeholder="投资人姓名" <Input placeholder="投资人姓名"
{...getFieldProps('realName', { {...getFieldProps('realName', {
initialValue: audit.realName initialValue: audit.realName
})} /> })} />
</Form.Item> </Form.Item>
: :
<Form.Item label="投资人姓名" {...filayout}> <Form.Item label="投资人姓名" {...leftRightFormItemLayout}>
{audit.realName} {audit.realName}
</Form.Item> </Form.Item>
} }
{ {
isEdit ? isEdit ?
<Form.Item label="投资人身份证号码" help="真实的投资人身份证号码，请核对身份证照片上的号码" {...filayout}> <Form.Item label="投资人身份证号码" help="真实的投资人身份证号码，请核对身份证照片上的号码" {...leftRightFormItemLayout}>
<Input placeholder="投资人身份证号码" <Input placeholder="投资人身份证号码"
{...getFieldProps('identityCardNumber', { {...getFieldProps('identityCardNumber', {
initialValue: audit.identityCardNumber initialValue: audit.identityCardNumber
})} /> })} />
</Form.Item> </Form.Item>
: :
<Form.Item label="投资人身份证号码" {...filayout}> <Form.Item label="投资人身份证号码" {...leftRightFormItemLayout}>
{audit.identityCardNumber} {audit.identityCardNumber}
</Form.Item> </Form.Item>
} }
{ {
isEdit && isEdit &&
<Form.Item label="拒绝理由" {...filayout}> <Form.Item label="拒绝理由" {...leftRightFormItemLayout}>
<Input placeholder="拒绝理由" <Input placeholder="拒绝理由"
{...getFieldProps('memo', { {...getFieldProps('memo', {
initialValue: audit.memo initialValue: audit.memo
......
src/utils.js
View file @ 3055db68
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
// return key + '=' + query[key]; // return key + '=' + query[key];
// }).join('&'); // }).join('&');
export const NULL = '_____?_____';
export function serialize(obj, prefix) { export function serialize(obj, prefix) {
var str = []; var str = [];
...@@ -139,6 +140,10 @@ export const formItemLayout = { ...@@ -139,6 +140,10 @@ export const formItemLayout = {
labelCol: {span: 4}, labelCol: {span: 4},
wrapperCol: {span: 16}, wrapperCol: {span: 16},
}; };
export const leftRightFormItemLayout = {
labelCol: {span: 6},
wrapperCol: {span: 16}
};
export const smallFormItemLayout = { export const smallFormItemLayout = {
labelCol: {span: 4}, labelCol: {span: 4},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment