Skip to content

朱继来 / 后台订单管理

Go to a project
Commit ac69327c by 叶明星
Options

Merge branch 'ymx-账期管理-2018091009' into development

parents 90e8f82e 8bc60e64
Inline Side-by-side
Showing with 214 additions and 101 deletions
.idea/workspace.xml
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
<bookmark url="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js" line="7" /> <bookmark url="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js" line="7" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="" /> <list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/AuthPaymentDays.js" afterPath="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" afterPath="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
</list>
<ignored path="Order.iws" /> <ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" /> <ignored path=".idea/dataSources.local.xml" />
...@@ -25,11 +28,11 @@ ...@@ -25,11 +28,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PaymentDaysList.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PaymentDaysList.blade.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000"> <state relative-caret-position="450">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" /> <caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -55,16 +58,6 @@ ...@@ -55,16 +58,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="UploadMonopolyFile.js" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="website.php" pinned="false" current-in-tab="false"> <file leaf-file-name="website.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/website.php"> <entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -78,8 +71,8 @@ ...@@ -78,8 +71,8 @@
<file leaf-file-name="AuthPaymentDays.js" pinned="false" current-in-tab="false"> <file leaf-file-name="AuthPaymentDays.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js"> <entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="675">
<caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" /> <caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
<folding> <folding>
<element signature="e#0#43#0" expanded="false" /> <element signature="e#0#43#0" expanded="false" />
</folding> </folding>
...@@ -87,52 +80,6 @@ ...@@ -87,52 +80,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="122" selection-start-line="18" selection-start-column="122" selection-end-line="18" selection-end-column="122" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="composer.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825">
<caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -162,11 +109,11 @@ ...@@ -162,11 +109,11 @@
<option value="$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" /> <option value="$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" /> <option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
<option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" /> <option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
<option value="$PROJECT_DIR$/resources/views/layouts/header.blade.php" /> <option value="$PROJECT_DIR$/resources/views/layouts/header.blade.php" />
<option value="$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" /> <option value="$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -239,6 +186,60 @@ ...@@ -239,6 +186,60 @@
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PaymentDays" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
...@@ -304,7 +305,7 @@ ...@@ -304,7 +305,7 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="34708000" /> <option name="totallyTimeSpent" value="35479000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" /> <frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
...@@ -350,6 +351,118 @@ ...@@ -350,6 +351,118 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="122" selection-start-line="18" selection-start-column="122" selection-end-line="18" selection-end-column="122" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/maatwebsite/excel/src/Maatwebsite/Excel/Facades/Excel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<caret line="202" column="46" selection-start-line="202" selection-start-column="46" selection-end-line="202" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000"> <state relative-caret-position="1000">
...@@ -430,7 +543,7 @@ ...@@ -430,7 +543,7 @@
<state relative-caret-position="2675"> <state relative-caret-position="2675">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#40#71#0#PHP" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -545,8 +658,9 @@ ...@@ -545,8 +658,9 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/app.php"> <entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="664"> <state relative-caret-position="639">
<caret line="202" column="58" selection-start-line="202" selection-start-column="58" selection-end-line="202" selection-end-column="58" /> <caret line="202" column="46" selection-start-line="202" selection-start-column="46" selection-end-line="202" selection-end-column="46" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -566,7 +680,7 @@ ...@@ -566,7 +680,7 @@
<state relative-caret-position="2675"> <state relative-caret-position="2675">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#40#71#0#PHP" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -592,16 +706,6 @@ ...@@ -592,16 +706,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php"> <entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250"> <state relative-caret-position="1250">
...@@ -610,24 +714,6 @@ ...@@ -610,24 +714,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1000">
<caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550"> <state relative-caret-position="550">
...@@ -654,8 +740,36 @@ ...@@ -654,8 +740,36 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825"> <state relative-caret-position="250">
<caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" /> <caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
<folding>
<element signature="e#0#43#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
public/js/AuthPaymentDays.js
...@@ -27,7 +27,7 @@ layui.use('form', function() { ...@@ -27,7 +27,7 @@ layui.use('form', function() {
error:function(){ error:function(){
return layer.msg('网络错误，请重试',{icon:5}); return layer.msg('网络错误，请重试',{icon:5});
} }
}) });
layer.close(index); layer.close(index);
}); });
......
resources/views/PaymentDays/PaymentDaysList.blade.php
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
@{{# }else{ }} @{{# }else{ }}
<a href="/web/AuthPaymentDays?id=@{{d.id}}" class="btn btn-xs btn-outline btn-success Release"><strong>详情</strong></a> <a href="/web/AuthPaymentDays?id=@{{d.id}}" class="btn btn-xs btn-outline btn-success Release"><strong>详情</strong></a>
@{{# } }} @{{# } }}
<a target="_blank" class="btn btn-xs btn-outline btn-primary"><strong>编辑</strong></a>
</script> </script>
<script type="text/html" id="status"> <script type="text/html" id="status">
@{{# if(d.status == 1){ }} @{{# if(d.status == 1){ }}
......
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 sign in to comment