Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 8d229902 by 叶明星
Options

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

parents 0c8cc031 58007519
Inline Side-by-side
Showing with 63 additions and 73 deletions
.idea/workspace.xml
...@@ -5,7 +5,11 @@ ...@@ -5,7 +5,11 @@
</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$/resources/views/PaymentDays/AuthPaymentDays.blade.php" afterPath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" /> <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> </list>
<ignored path="Order.iws" /> <ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -27,11 +31,11 @@ ...@@ -27,11 +31,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="1100"> <state relative-caret-position="625">
<caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" /> <caret line="28" column="51" selection-start-line="28" selection-start-column="51" selection-end-line="28" selection-end-column="51" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -40,8 +44,8 @@ ...@@ -40,8 +44,8 @@
<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="700"> <state relative-caret-position="473">
<caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" /> <caret line="39" column="41" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
<folding> <folding>
<element signature="e#0#42#0" expanded="false" /> <element signature="e#0#42#0" expanded="false" />
</folding> </folding>
...@@ -59,11 +63,11 @@ ...@@ -59,11 +63,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="true"> <file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="false">
<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="725"> <state relative-caret-position="125">
<caret line="92" column="22" selection-start-line="83" selection-start-column="16" selection-end-line="92" selection-end-column="22" /> <caret line="68" column="17" selection-start-line="68" selection-start-column="17" selection-end-line="68" selection-end-column="17" />
<folding> <folding>
<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#0;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
...@@ -107,8 +111,8 @@ ...@@ -107,8 +111,8 @@
<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="1025"> <state relative-caret-position="389">
<caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" /> <caret line="31" column="154" selection-start-line="31" selection-start-column="154" selection-end-line="31" selection-end-column="154" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#40#71#0#PHP" expanded="true" />
</folding> </folding>
...@@ -119,8 +123,8 @@ ...@@ -119,8 +123,8 @@
<file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="false"> <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="304"> <state relative-caret-position="104">
<caret line="20" column="87" selection-start-line="20" selection-start-column="87" selection-end-line="20" selection-end-column="87" /> <caret line="30" column="67" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
<folding> <folding>
<element signature="e#29#68#0#PHP" expanded="true" /> <element signature="e#29#68#0#PHP" expanded="true" />
</folding> </folding>
...@@ -154,14 +158,14 @@ ...@@ -154,14 +158,14 @@
<option value="$PROJECT_DIR$/composer.json" /> <option value="$PROJECT_DIR$/composer.json" />
<option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" />
<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$/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/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/PaymentDaysList.blade.php" />
<option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" /> <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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -318,29 +322,7 @@ ...@@ -318,29 +322,7 @@
<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_ELEMENT> <PATH_ELEMENT>
<option name="myItemId" value="Http" /> <option name="myItemId" value="Model" />
<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="app" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Http" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Controllers" />
<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>
...@@ -404,12 +386,12 @@ ...@@ -404,12 +386,12 @@
<workItem from="1539065020769" duration="33480000" /> <workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="1228000" /> <workItem from="1539167536899" duration="1228000" />
<workItem from="1539327663189" duration="3659000" /> <workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="692000" /> <workItem from="1539332944482" duration="1820000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="40345000" /> <option name="totallyTimeSpent" value="41473000" />
</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" />
...@@ -652,6 +634,7 @@ ...@@ -652,6 +634,7 @@
<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>
...@@ -729,6 +712,7 @@ ...@@ -729,6 +712,7 @@
<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>
...@@ -793,62 +777,62 @@ ...@@ -793,62 +777,62 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js"> <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="325"> <state relative-caret-position="125">
<caret line="15" column="33" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="33" /> <caret line="68" column="17" selection-start-line="68" selection-start-column="17" selection-end-line="68" selection-end-column="17" />
<folding> <folding>
<element signature="e#0#43#0" expanded="false" /> <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#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js"> <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="700"> <state relative-caret-position="389">
<caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" /> <caret line="31" column="154" selection-start-line="31" selection-start-column="154" selection-end-line="31" selection-end-column="154" />
<folding> <folding>
<element signature="e#0#42#0" expanded="false" /> <element signature="e#40#71#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.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="1100"> <state relative-caret-position="104">
<caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" /> <caret line="30" column="67" selection-start-line="30" selection-start-column="67" selection-end-line="30" selection-end-column="67" />
<folding /> <folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <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="1025"> <state relative-caret-position="325">
<caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" /> <caret line="15" column="33" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="33" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#0#43#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php"> <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="304"> <state relative-caret-position="473">
<caret line="20" column="87" selection-start-line="20" selection-start-column="87" selection-end-line="20" selection-end-column="87" /> <caret line="39" column="41" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
<folding> <folding>
<element signature="e#29#68#0#PHP" expanded="true" /> <element signature="e#0#42#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.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="725"> <state relative-caret-position="625">
<caret line="92" column="22" selection-start-line="83" selection-start-column="16" selection-end-line="92" selection-end-column="22" /> <caret line="28" column="51" selection-start-line="28" selection-start-column="51" selection-end-line="28" selection-end-column="51" />
<folding> <folding />
<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#1;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/Http/Controllers/ApiController.php
...@@ -26,13 +26,13 @@ class ApiController extends Controller ...@@ -26,13 +26,13 @@ class ApiController extends Controller
} }
} }
private function ExportLayui($errcode=0,$errmsg=0,$data=[],$count=0){ private function ExportLayui($errcode=0,$errmsg=0,$data=[],$count=0,$total=''){
if(is_array($errcode)){ if(is_array($errcode)){
ErrorLog($errcode[0],$errcode[1]); ErrorLog($errcode[0],$errcode[1]);
echo json_encode(['code'=>$errcode[0],'msg'=>$errcode[1],'data'=>$errcode[2],'count'=>$errcode[3]]); echo json_encode(['code'=>$errcode[0],'msg'=>$errcode[1],'data'=>$errcode[2],'count'=>$errcode[3],'total'=>!empty($errcode[4])?$errcode[4]:'']);
}else{ }else{
ErrorLog($errcode,$errmsg); ErrorLog($errcode,$errmsg);
echo json_encode(['code'=>$errcode,'msg'=>$errmsg,'data'=>$data,'count'=>$count]); echo json_encode(['code'=>$errcode,'msg'=>$errmsg,'data'=>$data,'count'=>$count,'total'=>$total]);
} }
exit(); exit();
} }
......
app/Model/PaymentDaysModel.php
...@@ -44,7 +44,7 @@ class PaymentDaysModel extends Model ...@@ -44,7 +44,7 @@ class PaymentDaysModel extends Model
}); });
})->export('xls'); })->export('xls');
} }
return [0,'成功',$list['data'],$list['total']]; return [0,'成功',$list['data'],$list['total'],$limit];
} }
public function AuthPaymentDays(){ public function AuthPaymentDays(){
......
public/js/PaymentDaysList.js
...@@ -35,6 +35,10 @@ layui.use(['table','form','laydate','layer'], function() { ...@@ -35,6 +35,10 @@ layui.use(['table','form','laydate','layer'], function() {
,page: { ,page: {
// layout: ['prev', 'page', 'next', 'count', 'skip'] //自定义分页布局 // layout: ['prev', 'page', 'next', 'count', 'skip'] //自定义分页布局
} }
, done: function(res, curr, count){
$('input[name=limit]').val(res.total);
$('input[name=p]').val(curr);
}
}); });
form.on('submit(load)', function(data){ form.on('submit(load)', function(data){
if($(data.elem).data('type')=='Export'){ if($(data.elem).data('type')=='Export'){
......
resources/views/PaymentDays/PaymentDaysList.blade.php
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
@endforeach @endforeach
@endif @endif
</div> </div>
<input type="hidden" value="1" name="p">
<input type="hidden" value="10" name="limit">
<button lay-submit lay-filter="load" class="layui-btn layui-btn-lg reload" data-type="reload">搜索</button> <button lay-submit lay-filter="load" class="layui-btn layui-btn-lg reload" data-type="reload">搜索</button>
<button lay-submit lay-filter="load" data-type="Export" class="layui-btn float-r" type="submit"><i class="layui-icon">&#xe601;</i>导出</button> <button lay-submit lay-filter="load" data-type="Export" class="layui-btn float-r" type="submit"><i class="layui-icon">&#xe601;</i>导出</button>
</div> </div>
......
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