Skip to content

朱继来 / 后台订单管理

Go to a project
Commit d3d4054e by 叶明星
Options

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

parents c23379e8 73976953
Inline Side-by-side
Showing with 38 additions and 54 deletions
.idea/workspace.xml
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
</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$/app/Model/PaymentDaysModel.php" afterPath="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" afterPath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
</list> </list>
<ignored path="Order.iws" /> <ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -30,7 +31,7 @@ ...@@ -30,7 +31,7 @@
<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="false">
<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="475"> <state relative-caret-position="1100">
<caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" /> <caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
<folding /> <folding />
</state> </state>
...@@ -40,7 +41,7 @@ ...@@ -40,7 +41,7 @@
<file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="false"> <file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js"> <entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="700">
<caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" /> <caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" />
<folding> <folding>
<element signature="e#0#42#0" expanded="false" /> <element signature="e#0#42#0" expanded="false" />
...@@ -52,24 +53,20 @@ ...@@ -52,24 +53,20 @@
<file leaf-file-name="app.php" pinned="false" current-in-tab="false"> <file leaf-file-name="app.php" pinned="false" current-in-tab="false">
<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="589"> <state relative-caret-position="4625">
<caret line="185" column="62" selection-start-line="185" selection-start-column="62" selection-end-line="185" selection-end-column="62" /> <caret line="185" column="62" selection-start-line="185" selection-start-column="62" selection-end-line="185" selection-end-column="62" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="true">
<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="575"> <state relative-caret-position="525">
<caret line="85" column="34" selection-start-line="85" selection-start-column="34" selection-end-line="85" selection-end-column="34" /> <caret line="85" column="26" selection-start-line="83" selection-start-column="20" selection-end-line="85" selection-end-column="26" />
<folding> <folding>
<element signature="n#style#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" /> <marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." />
<element signature="n#style#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -110,7 +107,7 @@ ...@@ -110,7 +107,7 @@
<file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="564"> <state relative-caret-position="1025">
<caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" /> <caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#40#71#0#PHP" expanded="true" />
...@@ -119,11 +116,11 @@ ...@@ -119,11 +116,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="true"> <file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php"> <entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254"> <state relative-caret-position="304">
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" /> <caret line="20" column="87" selection-start-line="20" selection-start-column="87" selection-end-line="20" selection-end-column="87" />
<folding> <folding>
<element signature="e#29#68#0#PHP" expanded="true" /> <element signature="e#29#68#0#PHP" expanded="true" />
</folding> </folding>
...@@ -162,9 +159,9 @@ ...@@ -162,9 +159,9 @@
<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/PaymentDaysList.js" /> <option value="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
<option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" /> <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/PaymentDaysList.blade.php" /> <option value="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
<option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" /> <option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -219,8 +216,8 @@ ...@@ -219,8 +216,8 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -406,12 +403,13 @@ ...@@ -406,12 +403,13 @@
<updated>1539065019417</updated> <updated>1539065019417</updated>
<workItem from="1539065020769" duration="33480000" /> <workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="1228000" /> <workItem from="1539167536899" duration="1228000" />
<workItem from="1539327663189" duration="3442000" /> <workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="56000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="39436000" /> <option name="totallyTimeSpent" value="39709000" />
</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" />
...@@ -518,11 +516,7 @@ ...@@ -518,11 +516,7 @@
<state relative-caret-position="550"> <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" /> <caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding> <folding>
<element signature="n#style#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" /> <marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." />
<element signature="n#style#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -578,11 +572,7 @@ ...@@ -578,11 +572,7 @@
<state relative-caret-position="1975"> <state relative-caret-position="1975">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" /> <caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" />
<folding> <folding>
<element signature="n#style#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" /> <marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." />
<element signature="n#style#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -660,7 +650,6 @@ ...@@ -660,7 +650,6 @@
<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">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -738,7 +727,6 @@ ...@@ -738,7 +727,6 @@
<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">
<caret line="186" column="13" selection-start-line="186" selection-start-column="13" selection-end-line="186" selection-end-column="13" /> <caret line="186" column="13" selection-start-line="186" selection-start-column="13" selection-end-line="186" selection-end-column="13" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -797,7 +785,7 @@ ...@@ -797,7 +785,7 @@
</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="589"> <state relative-caret-position="4625">
<caret line="185" column="62" selection-start-line="185" selection-start-column="62" selection-end-line="185" selection-end-column="62" /> <caret line="185" column="62" selection-start-line="185" selection-start-column="62" selection-end-line="185" selection-end-column="62" />
<folding /> <folding />
</state> </state>
...@@ -815,7 +803,7 @@ ...@@ -815,7 +803,7 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js"> <entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="700">
<caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" /> <caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" />
<folding> <folding>
<element signature="e#0#42#0" expanded="false" /> <element signature="e#0#42#0" expanded="false" />
...@@ -825,42 +813,38 @@ ...@@ -825,42 +813,38 @@
</entry> </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="475"> <state relative-caret-position="1100">
<caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" /> <caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575"> <state relative-caret-position="1025">
<caret line="85" column="34" selection-start-line="85" selection-start-column="34" selection-end-line="85" selection-end-column="34" /> <caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" />
<folding> <folding>
<element signature="n#style#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" /> <element signature="e#40#71#0#PHP" expanded="true" />
<element signature="n#style#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="564"> <state relative-caret-position="304">
<caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" /> <caret line="20" column="87" selection-start-line="20" selection-start-column="87" selection-end-line="20" selection-end-column="87" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#29#68#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.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="254"> <state relative-caret-position="525">
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" /> <caret line="85" column="26" selection-start-line="83" selection-start-column="20" selection-end-line="85" selection-end-column="26" />
<folding> <folding>
<element signature="e#29#68#0#PHP" expanded="true" /> <marker date="1539332952573" expanded="false" signature="4076:4094" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
......
resources/views/PaymentDays/AuthPaymentDays.blade.php
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
</div> </div>
@if($info['status']==1) @if($info['status']==1)
{{--<div class="layui-input-block" style="text-align: center">--}} <div class="layui-input-block" style="text-align: center">
{{--<button class="layui-btn" lay-submit lay-filter="load">立即提交</button>--}} <button class="layui-btn" lay-submit lay-filter="load">立即提交</button>
{{--</div>--}} </div>
@else @else
<div class="layui-input-inline" style="width: auto"> <div class="layui-input-inline" style="width: auto">
<label class="layui-form-label">审核原因：</label> <label class="layui-form-label">审核原因：</label>
......
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