Skip to content

朱继来 / 后台订单管理

Go to a project
Commit fd91f39a by 叶明星
Options

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

parents c56dd8ca 4164ebaf
Inline Side-by-side
Showing with 216 additions and 110 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$/.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/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" /> <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" />
...@@ -28,11 +32,33 @@ ...@@ -28,11 +32,33 @@
</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="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"> <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="450"> <state relative-caret-position="475">
<caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" /> <caret line="44" column="36" selection-start-line="44" selection-start-column="36" selection-end-line="44" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PaymentDaysList.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="30" column="31" selection-start-line="30" selection-start-column="21" selection-end-line="30" selection-end-column="31" />
<folding>
<element signature="e#0#42#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="app.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<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>
...@@ -41,9 +67,15 @@ ...@@ -41,9 +67,15 @@
<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="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="550"> <state relative-caret-position="575">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" /> <caret line="85" column="34" selection-start-line="85" selection-start-column="34" selection-end-line="85" selection-end-column="34" />
<folding /> <folding>
<element signature="n#style#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#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539331805335" expanded="false" signature="4080:4098" placeholder="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -71,8 +103,8 @@ ...@@ -71,8 +103,8 @@
<file leaf-file-name="AuthPaymentDays.js" pinned="false" current-in-tab="false"> <file leaf-file-name="AuthPaymentDays.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js"> <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="675"> <state relative-caret-position="325">
<caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" /> <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#0#43#0" expanded="false" /> <element signature="e#0#43#0" expanded="false" />
</folding> </folding>
...@@ -80,6 +112,30 @@ ...@@ -80,6 +112,30 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="564">
<caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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">
<caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
<folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -104,16 +160,16 @@ ...@@ -104,16 +160,16 @@
<option value="$PROJECT_DIR$/public/js/common.min.js" /> <option value="$PROJECT_DIR$/public/js/common.min.js" />
<option value="$PROJECT_DIR$/config/app.php" /> <option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/composer.json" /> <option value="$PROJECT_DIR$/composer.json" />
<option value="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
<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$/app/Http/Controllers/ApiController.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/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/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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -168,6 +224,8 @@ ...@@ -168,6 +224,8 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -240,10 +298,62 @@ ...@@ -240,10 +298,62 @@
<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>
<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>
<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>
<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" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -301,11 +411,12 @@ ...@@ -301,11 +411,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" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="35479000" /> <option name="totallyTimeSpent" value="39103000" />
</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" />
...@@ -411,7 +522,13 @@ ...@@ -411,7 +522,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<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" />
<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="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -423,19 +540,11 @@ ...@@ -423,19 +540,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js"> <entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250"> <state relative-caret-position="250">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" /> <caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -443,7 +552,6 @@ ...@@ -443,7 +552,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
<caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -451,7 +559,6 @@ ...@@ -451,7 +559,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375"> <state relative-caret-position="375">
<caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" /> <caret line="15" column="6" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="6" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -475,7 +582,13 @@ ...@@ -475,7 +582,13 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<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" />
<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="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -491,10 +604,6 @@ ...@@ -491,10 +604,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41875"> <state relative-caret-position="41875">
<caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" /> <caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" />
<folding>
<marker date="1539064767941" expanded="true" signature="16522:16622" placeholder="SELECT * FRO... department" />
<marker date="1539064767941" expanded="true" signature="16563:16621" placeholder="SELECT depar... department" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -542,9 +651,6 @@ ...@@ -542,9 +651,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2675"> <state relative-caret-position="2675">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
<folding>
<element signature="e#40#71#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -552,7 +658,6 @@ ...@@ -552,7 +658,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="825"> <state relative-caret-position="825">
<caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" /> <caret line="33" column="9" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -656,22 +761,10 @@ ...@@ -656,22 +761,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="639">
<caret line="202" column="46" selection-start-line="202" selection-start-column="46" selection-end-line="202" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41875"> <state relative-caret-position="41875">
<caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" /> <caret line="1684" column="50" selection-start-line="1684" selection-start-column="45" selection-end-line="1684" selection-end-column="50" />
<folding>
<marker date="1539064767941" expanded="true" signature="16522:16622" placeholder="SELECT * FRO... department" />
<marker date="1539064767941" expanded="true" signature="16563:16621" placeholder="SELECT depar... department" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -679,98 +772,101 @@ ...@@ -679,98 +772,101 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2675"> <state relative-caret-position="2675">
<caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" /> <caret line="107" column="0" selection-start-line="107" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
<folding>
<element signature="e#40#71#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" /> <entry file="file://$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" />
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="650"> <state relative-caret-position="1250">
<caret line="26" column="5" selection-start-line="26" selection-start-column="5" selection-end-line="26" selection-end-column="5" /> <caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" />
<folding> <folding />
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php"> <entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="300">
<caret line="18" column="122" selection-start-line="18" selection-start-column="122" selection-end-line="18" selection-end-column="122" /> <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
<folding> <folding />
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/website.php"> <entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1250"> <state relative-caret-position="250">
<caret line="50" column="19" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="19" /> <caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.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="550"> <state relative-caret-position="589">
<caret line="79" column="59" selection-start-line="79" selection-start-column="59" selection-end-line="79" selection-end-column="59" /> <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>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.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="300"> <state relative-caret-position="325">
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> <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#0#43#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.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="175"> <state relative-caret-position="400">
<caret line="7" column="19" selection-start-line="7" selection-start-column="19" selection-end-line="7" selection-end-column="19" /> <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" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/composer.json"> <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="250"> <state relative-caret-position="475">
<caret line="10" column="38" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" /> <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$/public/js/PaymentDaysList.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="475"> <state relative-caret-position="575">
<caret line="39" column="22" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" /> <caret line="85" column="34" selection-start-line="85" selection-start-column="34" selection-end-line="85" selection-end-column="34" />
<folding> <folding>
<element signature="e#0#42#0" expanded="false" /> <element signature="n#style#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#1;n#div#0;n#fieldset#2;n#div#0;n#!!top" expanded="true" />
<marker date="1539331805335" expanded="false" signature="4080:4098" placeholder="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/AuthPaymentDays.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="675"> <state relative-caret-position="564">
<caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" /> <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#0#43#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="450"> <state relative-caret-position="504">
<caret line="39" column="13" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" /> <caret line="22" column="13" selection-start-line="22" selection-start-column="13" selection-end-line="22" selection-end-column="13" />
<folding /> <folding>
<element signature="e#29#68#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/Model/PaymentDaysModel.php
...@@ -16,11 +16,11 @@ class PaymentDaysModel extends Model ...@@ -16,11 +16,11 @@ class PaymentDaysModel extends Model
$collert=Request::only('user_id','ac_id','status','limit','p','Export'); $collert=Request::only('user_id','ac_id','status','limit','p','Export');
$limit=!empty($collert['limit'])?$collert['limit']:10; $limit=!empty($collert['limit'])?$collert['limit']:10;
$p=!empty($collert['p'])?$collert['p']:1; $p=!empty($collert['p'])?$collert['p']:1;
$Select=['id','lie_payment_days.user_id','add_time','com_name','lie_payment_days.mobile','ac_id','lie_payment_days.status','lie_user_main.mobile as usmobile','email']; $Select=['id','auth_cause','lie_payment_days.user_id','add_time','com_name','lie_payment_days.mobile','ac_id','lie_payment_days.status','lie_user_main.mobile as usmobile','email'];
$list=$this->where(function($query) use ($collert){ $list=$this->where(function($query) use ($collert){
if(!empty($collert['ac_id'])) $query->where('ac_id','=',$collert['ac_id']); if(!empty($collert['ac_id'])) $query->where('ac_id','=',$collert['ac_id']);
if(!empty($collert['status'])) $query->whereIn('lie_payment_days.status',explode(',',rtrim($collert['status'],','))); if(!empty($collert['status'])) $query->whereIn('lie_payment_days.status',explode(',',rtrim($collert['status'],',')));
})->leftJoin('lie_user_main',function($join) use($collert){ })->join('lie_user_main',function($join) use($collert){
if(!empty($collert['user_id'])){ if(!empty($collert['user_id'])){
$join->on('lie_payment_days.user_id','=','lie_user_main.user_id') $join->on('lie_payment_days.user_id','=','lie_user_main.user_id')
->where('lie_user_main.mobile','=',$collert['user_id'])->orWhere('lie_user_main.email','=',$collert['user_id']); ->where('lie_user_main.mobile','=',$collert['user_id'])->orWhere('lie_user_main.email','=',$collert['user_id']);
...@@ -51,7 +51,7 @@ class PaymentDaysModel extends Model ...@@ -51,7 +51,7 @@ class PaymentDaysModel extends Model
$collert=Request::only('id'); $collert=Request::only('id');
$Select=['lie_payment_days.id','lie_payment_days.status','lie_payment_days.com_name','lie_payment_days.user_id','lie_payment_days.mobile','add_time', $Select=['lie_payment_days.id','lie_payment_days.status','lie_payment_days.com_name','lie_payment_days.user_id','lie_payment_days.mobile','add_time',
'lie_user_main.mobile as usmobile','email','company_id','com_telphone','tax_no','bank_name','com_area_id','com_address', 'lie_user_main.mobile as usmobile','email','company_id','com_telphone','tax_no','bank_name','com_area_id','com_address',
'com_city_id','com_province_id']; 'com_city_id','com_province_id','auth_cause'];
$info=$this->where('id','=',$collert['id']) $info=$this->where('id','=',$collert['id'])
->leftJoin('lie_user_main','lie_payment_days.user_id','=','lie_user_main.user_id') ->leftJoin('lie_user_main','lie_payment_days.user_id','=','lie_user_main.user_id')
->leftJoin('lie_user_company','lie_user_main.company_id','=','lie_user_company.com_id') ->leftJoin('lie_user_company','lie_user_main.company_id','=','lie_user_company.com_id')
...@@ -66,9 +66,9 @@ class PaymentDaysModel extends Model ...@@ -66,9 +66,9 @@ class PaymentDaysModel extends Model
} }
public function ApiAuthPaymentDays($AdminId){ public function ApiAuthPaymentDays($AdminId){
$collert=Request::only('id','status'); $collert=Request::only('id','status','auth_cause');
if(empty($collert['id']) || empty($collert['status'])) return [10002,'审核失败']; if(empty($collert['id']) || empty($collert['status'])) return [10002,'审核失败'];
$result=$this->where('id','=',$collert['id'])->update(['status'=>$collert['status'],'auth_id'=>$AdminId,'update_time'=>time()]); $result=$this->where('id','=',$collert['id'])->update(['auth_cause'=>$collert['auth_cause'],'status'=>$collert['status'],'auth_id'=>$AdminId,'update_time'=>time()]);
if(!$result) return [10001,'审核失败']; if(!$result) return [10001,'审核失败'];
return [0,'审核成功']; return [0,'审核成功'];
} }
......
public/js/AuthPaymentDays.js
...@@ -5,7 +5,9 @@ layui.use('form', function() { ...@@ -5,7 +5,9 @@ layui.use('form', function() {
var form=layui.form; var form=layui.form;
form.on('submit(load)', function(data) { form.on('submit(load)', function(data) {
layer.prompt({formType: 2,maxlength:100,title:'填写原因'},function(val, index){ layer.prompt({formType: 2,maxlength:100,title:'填写原因'},function(val, index){
if(!val) layer.msg('请填写原因',{icon:5}); if(!val) {
return layer.msg('请填写原因',{icon:5});
}
layer.msg('提交中', { layer.msg('提交中', {
icon: 16 icon: 16
,shade: 0.01 ,shade: 0.01
......
public/js/PaymentDaysList.js
...@@ -28,6 +28,7 @@ layui.use(['table','form','laydate','layer'], function() { ...@@ -28,6 +28,7 @@ layui.use(['table','form','laydate','layer'], function() {
,{field:'ac_id', title: '活动ID'} ,{field:'ac_id', title: '活动ID'}
,{field:'add_time', title: '申请时间',templet:'#add_time'} ,{field:'add_time', title: '申请时间',templet:'#add_time'}
,{field:'status', title: '申请状态',templet:'#status'} ,{field:'status', title: '申请状态',templet:'#status'}
,{field:'auth_cause', title: '原因'}
,{field:'experience', title: '操作',templet:'#edit',fixed:'right'} ,{field:'experience', title: '操作',templet:'#edit',fixed:'right'}
]] ]]
,id:'list' ,id:'list'
......
resources/views/PaymentDays/AuthPaymentDays.blade.php
...@@ -70,19 +70,26 @@ ...@@ -70,19 +70,26 @@
</tbody> </tbody>
</table> </table>
</fieldset> </fieldset>
@if($info['status']==1) <fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;padding-bottom: 200px">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 20px;">
<legend>审核</legend> <legend>审核</legend>
<input type="hidden" name="id" value="{{$info['id'] or ''}}"> <input type="hidden" name="id" value="{{$info['id'] or ''}}">
<div class="layui-form-item"> <div class="layui-form-item" style="margin-top: 20px">
<div class="layui-input-block"> <div class="layui-input-inline" style="width: auto">
<input type="radio" lay-verify="required" name="status" value="2" title="审核通过" checked> <label class="layui-form-label">审核结果：</label>
<input type="radio" lay-verify="required" name="status" value="3" title="审核不通过"> <input type="radio" lay-verify="required" name="status" value="2" title="审核通过" @if($info['status']==1 || $info['status']==2) checked @endif @if($info['status']!=1) disabled @endif>
</div> <input type="radio" lay-verify="required" name="status" value="3" title="审核不通过" @if($info['status']==3) checked @endif @if($info['status']!=1) disabled @endif>
<div class="layui-input-block" style="text-align: center">
<button class="layui-btn" lay-submit lay-filter="load">立即提交</button>
</div> </div>
@if($info['status']==1)
{{--<div class="layui-input-block" style="text-align: center">--}}
{{--<button class="layui-btn" lay-submit lay-filter="load">立即提交</button>--}}
{{--</div>--}}
@else
<div class="layui-input-inline" style="width: auto">
<label class="layui-form-label">审核原因：</label>
<div class="layui-form-mid">{{$info['auth_cause'] or ''}}</div>
</div>
@endif
</div> </div>
</fieldset> </fieldset>
@endif
</div> </div>
\ No newline at end of file
resources/views/PaymentDays/PaymentDaysList.blade.php
...@@ -52,5 +52,5 @@ ...@@ -52,5 +52,5 @@
@{{# if(d.usmobile){ }} @{{ d.usmobile }} @{{# }else{ }} @{{ d.email }} @{{# } }} @{{# if(d.usmobile){ }} @{{ d.usmobile }} @{{# }else{ }} @{{ d.email }} @{{# } }}
</script> </script>
<script type="text/html" id="add_time"> <script type="text/html" id="add_time">
@{{ date('Y-m-d H:i',1539072714)}} @{{ date('Y-m-d H:i',d.add_time)}}
</script> </script>
\ No newline at end of file
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