Skip to content

朱继来 / 后台订单管理

Go to a project
Commit c23379e8 by 叶明星
Options

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

parents fd91f39a 55757885
Inline Side-by-side
Showing with 12 additions and 17 deletions
.idea/workspace.xml
...@@ -5,12 +5,7 @@ ...@@ -5,12 +5,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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" afterPath="$PROJECT_DIR$/app/Model/PaymentDaysModel.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/AuthPaymentDays.js" afterPath="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<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/AuthPaymentDays.blade.php" afterPath="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
<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" />
...@@ -74,7 +69,7 @@ ...@@ -74,7 +69,7 @@
<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#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#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" /> <element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539331805335" expanded="false" signature="4080:4098" placeholder="..." /> <marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -127,8 +122,8 @@ ...@@ -127,8 +122,8 @@
<file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="true"> <file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="true">
<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="504"> <state relative-caret-position="254">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
<folding> <folding>
<element signature="e#29#68#0#PHP" expanded="true" /> <element signature="e#29#68#0#PHP" expanded="true" />
</folding> </folding>
...@@ -411,12 +406,12 @@ ...@@ -411,12 +406,12 @@
<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="3109000" /> <workItem from="1539327663189" duration="3442000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="39103000" /> <option name="totallyTimeSpent" value="39436000" />
</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" />
...@@ -527,7 +522,7 @@ ...@@ -527,7 +522,7 @@
<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#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#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" /> <element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539331805335" expanded="false" signature="4080:4098" placeholder="..." /> <marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -587,7 +582,7 @@ ...@@ -587,7 +582,7 @@
<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#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#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" /> <element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539331805335" expanded="false" signature="4080:4098" placeholder="..." /> <marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -845,7 +840,7 @@ ...@@ -845,7 +840,7 @@
<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#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#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" /> <element signature="n#style#0;n#div#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539331805335" expanded="false" signature="4080:4098" placeholder="..." /> <marker date="1539332141412" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -862,8 +857,8 @@ ...@@ -862,8 +857,8 @@
</entry> </entry>
<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="504"> <state relative-caret-position="254">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" /> <caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
<folding> <folding>
<element signature="e#29#68#0#PHP" expanded="true" /> <element signature="e#29#68#0#PHP" expanded="true" />
</folding> </folding>
......
app/Model/PaymentDaysModel.php
...@@ -30,12 +30,12 @@ class PaymentDaysModel extends Model ...@@ -30,12 +30,12 @@ class PaymentDaysModel extends Model
})->select($Select)->paginate($limit,['*'],'p',$p)->toArray(); })->select($Select)->paginate($limit,['*'],'p',$p)->toArray();
if(!empty($collert['Export']) && $collert['Export']==true){ if(!empty($collert['Export']) && $collert['Export']==true){
$cellData = [ $cellData = [
['ID','会员账号','公司名称','联系方式','活动ID','申请时间','申请状态'] ['ID','会员账号','公司名称','联系方式','活动ID','申请时间','申请状态','审核原因']
]; ];
$Status=[1=>'待审核',2=>'审核通过',3=>'审核不通过']; $Status=[1=>'待审核',2=>'审核通过',3=>'审核不通过'];
foreach ($list['data'] as $k=>$v){ foreach ($list['data'] as $k=>$v){
$v['status_name']=empty($Status[$v['status']])?'未知':$Status[$v['status']]; $v['status_name']=empty($Status[$v['status']])?'未知':$Status[$v['status']];
$info=[$v['id'],empty($v['usmobile'])?$v['email']:$v['usmobile'],$v['com_name'],$v['mobile'],$v['ac_id'],date('Y-m-d H:i',$v['add_time']),$v['status_name']]; $info=[$v['id'],empty($v['usmobile'])?$v['email']:$v['usmobile'],$v['com_name'],$v['mobile'],$v['ac_id'],date('Y-m-d H:i',$v['add_time']),$v['status_name'],$v['auth_cause']];
array_push($cellData,$info); array_push($cellData,$info);
} }
Excel::create("账期搜索结果",function ($excel) use ($cellData){ Excel::create("账期搜索结果",function ($excel) use ($cellData){
......
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