导出添加原因

55757885 · 叶明星 · 4164ebaf · 55757885 · 55757885
Commit 55757885 authored Oct 12, 2018 by 叶明星
Showing with 12 additions and 17 deletions
.idea/workspace.xml
app/Model/PaymentDaysModel.php
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +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/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>
    <ignored path="Order.iws" />
    <ignored path=".idea/workspace.xml" />
@@ -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#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>
            </state>
          </provider>
@@ -127,8 +122,8 @@
      <file leaf-file-name="PaymentDaysModel.php" pinned="false" current-in-tab="true">
        <entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
          <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>
                <element signature="e#29#68#0#PHP" expanded="true" />
              </folding>
@@ -411,12 +406,12 @@
      <updated>1539065019417</updated>
      <workItem from="1539065020769" duration="33480000" />
      <workItem from="1539167536899" duration="1228000" />
-      <workItem from="1539327663189" duration="3109000" />
+      <workItem from="1539327663189" duration="3442000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="39103000" />
+    <option name="totallyTimeSpent" value="39436000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="68" y="-8" width="1860" height="1096" extended-state="6" />
@@ -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#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>
        </state>
      </provider>
@@ -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#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>
        </state>
      </provider>
@@ -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#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>
        </state>
      </provider>
@@ -862,8 +857,8 @@
    </entry>
    <entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
      <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>
            <element signature="e#29#68#0#PHP" expanded="true" />
          </folding>

--- a/app/Model/PaymentDaysModel.php
+++ b/app/Model/PaymentDaysModel.php
@@ -30,12 +30,12 @@ class PaymentDaysModel extends Model
        })->select($Select)->paginate($limit,['*'],'p',$p)->toArray();
        if(!empty($collert['Export']) && $collert['Export']==true){
            $cellData = [
-                ['ID','会员账号','公司名称','联系方式','活动ID','申请时间','申请状态']
+                ['ID','会员账号','公司名称','联系方式','活动ID','申请时间','申请状态','审核原因']
            ];
            $Status=[1=>'待审核',2=>'审核通过',3=>'审核不通过'];
            foreach ($list['data'] as $k=>$v){
                $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);
            }
            Excel::create("账期搜索结果",function ($excel) use ($cellData){