Skip to content

朱继来 / 后台订单管理

Go to a project
Commit deef10e9 by 叶明星
Options

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

parents 8a3b0eb6 0a23f9c3
Inline Side-by-side
Showing with 19 additions and 22 deletions
.idea/workspace.xml
......@@ -5,11 +5,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" afterPath="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/PaymentDaysList.js" afterPath="$PROJECT_DIR$/public/js/PaymentDaysList.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=".idea/workspace.xml" />
......@@ -31,21 +27,21 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PaymentDaysList.blade.php" pinned="false" current-in-tab="true">
<file leaf-file-name="PaymentDaysList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="28" column="51" selection-start-line="28" selection-start-column="51" selection-end-line="28" selection-end-column="51" />
<state relative-caret-position="600">
<caret line="27" column="43" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="false">
<file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="39" column="41" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
<caret line="51" column="32" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
......@@ -164,8 +160,8 @@
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
<option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<option value="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
<option value="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
</list>
</option>
</component>
......@@ -386,12 +382,12 @@
<workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="1228000" />
<workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="1820000" />
<workItem from="1539332944482" duration="2229000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="41473000" />
<option name="totallyTimeSpent" value="41882000" />
</component>
<component name="ToolWindowManager">
<frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
......@@ -818,23 +814,23 @@
</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="600">
<caret line="27" column="43" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="43" />
<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="473">
<caret line="39" column="41" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
<caret line="51" column="32" selection-start-line="51" selection-start-column="32" selection-end-line="51" selection-end-column="32" />
<folding>
<element signature="e#0#42#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="625">
<caret line="28" column="51" selection-start-line="28" selection-start-column="51" selection-end-line="28" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
public/js/PaymentDaysList.js
......@@ -48,6 +48,8 @@ layui.use(['table','form','laydate','layer'], function() {
}
//执行重载
delete data.field.Export;//删除导出标记
delete data.field.p;
delete data.field.limit;
table.reload('list', {
page: {
curr: 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