Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 70ffba76 by PRY5YKGJ82EZEPX\Administrator
Options

更新pcb后台

parent 824cf469
Inline Side-by-side
Showing with 213 additions and 417 deletions
.idea/workspace.xml
...@@ -6,19 +6,9 @@ ...@@ -6,19 +6,9 @@
<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$/.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/Http/Controllers/WebController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/WebController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Function.php" afterPath="$PROJECT_DIR$/app/Http/Function.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php" afterPath="$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" afterPath="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" afterPath="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php" afterPath="$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php" afterPath="$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/PcbOrderList.js" afterPath="$PROJECT_DIR$/public/js/PcbOrderList.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/PcbOrderList.js" afterPath="$PROJECT_DIR$/public/js/PcbOrderList.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/PcbPurchaseList.js" afterPath="$PROJECT_DIR$/public/js/PcbPurchaseList.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" />
</list> </list>
<ignored path="Order.iws" /> <ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
...@@ -39,127 +29,49 @@ ...@@ -39,127 +29,49 @@
</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="WebController.php" pinned="false" current-in-tab="true"> <file leaf-file-name="PcbOrderList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="175" column="54" selection-start-line="175" selection-start-column="54" selection-end-line="175" selection-end-column="54" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="header.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="30" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Function.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="619">
<caret line="211" column="19" selection-start-line="211" selection-start-column="15" selection-end-line="211" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="AuthPaymentDays.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="81" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding>
<element signature="n#style#0;n#fieldset#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PcbOrderDetail.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3466"> <state relative-caret-position="419">
<caret line="144" column="29" selection-start-line="144" selection-start-column="29" selection-end-line="144" selection-end-column="29" /> <caret line="93" column="48" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
<folding> <folding>
<marker date="1545708398296" expanded="true" signature="1533:1578" ph="..." /> <element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<marker date="1545708398296" expanded="true" signature="2256:2300" ph="..." /> <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#0;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PcbPurchaseDetail.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PcbOrderList.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php"> <entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2584">
<caret line="173" column="68" selection-start-line="173" selection-start-column="57" selection-end-line="173" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PcbPurchaseModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.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="473">
<caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" /> <caret line="203" column="41" selection-start-line="203" selection-start-column="41" selection-end-line="203" selection-end-column="41" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PcbPurchaseList.js" pinned="false" current-in-tab="false"> <file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.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="417"> <state relative-caret-position="250">
<caret line="28" column="40" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="40" /> <caret line="62" column="55" selection-start-line="62" selection-start-column="55" selection-end-line="62" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PcbOrderList.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PcbPublicModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php"> <entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php">
<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="508">
<caret line="12" column="63" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" /> <caret line="72" column="39" selection-start-line="72" selection-start-column="38" selection-end-line="72" selection-end-column="48" />
<folding> <folding>
<element signature="n#style#0;n#h2#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" /> <element signature="e#33#64#0#PHP" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="e#5554#5560#0#HTML" expanded="true" />
<element signature="e#5560#5566#0#HTML" expanded="true" />
<element signature="e#5566#5572#0#HTML" expanded="true" />
<element signature="e#5572#5578#0#HTML" expanded="true" />
<element signature="e#5578#5584#0#HTML" expanded="true" />
<element signature="e#5584#5590#0#HTML" expanded="true" />
<element signature="e#5590#5596#0#HTML" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#5870#5876#0#HTML" expanded="true" />
<element signature="e#5876#5882#0#HTML" expanded="true" />
<element signature="e#5882#5888#0#HTML" expanded="true" />
<element signature="e#5888#5894#0#HTML" expanded="true" />
<element signature="e#5894#5900#0#HTML" expanded="true" />
<element signature="e#5900#5906#0#HTML" expanded="true" />
<element signature="e#5906#5912#0#HTML" expanded="true" />
<element signature="e#5912#5918#0#HTML" expanded="true" />
<element signature="e#5923#5929#0#HTML" expanded="true" />
<element signature="e#5929#5935#0#HTML" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#6107#6113#0#HTML" expanded="true" />
<element signature="e#6113#6119#0#HTML" expanded="true" />
<element signature="e#6119#6125#0#HTML" expanded="true" />
<element signature="e#6125#6131#0#HTML" expanded="true" />
<element signature="n#style#0;n#button#0;n#div#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -210,10 +122,7 @@ ...@@ -210,10 +122,7 @@
<option value="$PROJECT_DIR$/public/js/PcbOrderDetail.js" /> <option value="$PROJECT_DIR$/public/js/PcbOrderDetail.js" />
<option value="$PROJECT_DIR$/app/Map/PcbOrderShippingMap.php" /> <option value="$PROJECT_DIR$/app/Map/PcbOrderShippingMap.php" />
<option value="$PROJECT_DIR$/config/params.php" /> <option value="$PROJECT_DIR$/config/params.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" />
<option value="$PROJECT_DIR$/public/js/PcbOrderList.js" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" /> <option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php" /> <option value="$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php" />
<option value="$PROJECT_DIR$/public/js/PcbPurchaseList.js" /> <option value="$PROJECT_DIR$/public/js/PcbPurchaseList.js" />
...@@ -224,6 +133,9 @@ ...@@ -224,6 +133,9 @@
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" /> <option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Function.php" /> <option value="$PROJECT_DIR$/app/Http/Function.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" />
<option value="$PROJECT_DIR$/public/js/PcbOrderList.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -281,114 +193,7 @@ ...@@ -281,114 +193,7 @@
</navigator> </navigator>
<panes> <panes>
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane />
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="Order" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</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>
<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="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<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="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="PaymentDays" />
<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="resources" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="views" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="layouts" />
<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="resources" />
<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>
</subPane>
</pane> </pane>
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
...@@ -478,14 +283,14 @@ ...@@ -478,14 +283,14 @@
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="116153000" /> <option name="totallyTimeSpent" value="119927000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12447917" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12447917" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
...@@ -506,6 +311,29 @@ ...@@ -506,6 +311,29 @@
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12447917" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25581396" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout-to-restore>
</component> </component>
<component name="UnknownFeatures"> <component name="UnknownFeatures">
<option featureType="com.intellij.fileTypeFactory" implementationName="*.env" /> <option featureType="com.intellij.fileTypeFactory" implementationName="*.env" />
...@@ -532,7 +360,6 @@ ...@@ -532,7 +360,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534"> <state relative-caret-position="534">
<caret line="75" column="75" selection-start-line="75" selection-start-column="75" selection-end-line="75" selection-end-column="75" /> <caret line="75" column="75" selection-start-line="75" selection-start-column="75" selection-end-line="75" selection-end-column="75" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -540,31 +367,15 @@ ...@@ -540,31 +367,15 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201"> <state relative-caret-position="201">
<caret line="41" column="24" selection-start-line="41" selection-start-column="24" selection-end-line="41" selection-end-column="24" /> <caret line="41" column="24" selection-start-line="41" selection-start-column="24" selection-end-line="41" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PcbOrderList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PcbOrderList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PcbOrderList.blade.php" />
<entry file="file://$PROJECT_DIR$/resources/views/PcbOrderList.blade.php" />
<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="575"> <state relative-caret-position="575">
<caret line="35" column="75" selection-start-line="35" selection-start-column="68" selection-end-line="35" selection-end-column="75" /> <caret line="35" column="75" selection-start-line="35" selection-start-column="68" selection-end-line="35" selection-end-column="75" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -572,7 +383,6 @@ ...@@ -572,7 +383,6 @@
<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>
...@@ -580,23 +390,16 @@ ...@@ -580,23 +390,16 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="400">
<caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="26" selection-end-column="14" /> <caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="26" selection-end-column="14" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/OrderModel.php"> <entry file="file://$PROJECT_DIR$/app/Model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307"> <state relative-caret-position="546">
<caret line="205" column="23" selection-start-line="205" selection-start-column="23" selection-end-line="212" selection-end-column="79" /> <caret line="22" column="9" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
<folding /> <folding>
</state> <element signature="e#28#67#0#PHP" expanded="false" />
</provider> </folding>
</entry>
<entry file="file://$PROJECT_DIR$/app/Map/PcbOrderMap.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="25" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="25" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -604,7 +407,6 @@ ...@@ -604,7 +407,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3772"> <state relative-caret-position="-3772">
<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>
...@@ -630,7 +432,6 @@ ...@@ -630,7 +432,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-525"> <state relative-caret-position="-525">
<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>
...@@ -638,9 +439,7 @@ ...@@ -638,9 +439,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400"> <state relative-caret-position="400">
<caret line="124" column="33" selection-start-line="124" selection-start-column="33" selection-end-line="124" selection-end-column="33" /> <caret line="124" column="33" selection-start-line="124" selection-start-column="33" selection-end-line="124" selection-end-column="33" />
<folding> <folding />
<element signature="n#style#0;n#p#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -648,7 +447,6 @@ ...@@ -648,7 +447,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284"> <state relative-caret-position="284">
<caret line="40" column="90" selection-start-line="40" selection-start-column="79" selection-end-line="40" selection-end-column="90" /> <caret line="40" column="90" selection-start-line="40" selection-start-column="79" selection-end-line="40" selection-end-column="90" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -656,7 +454,6 @@ ...@@ -656,7 +454,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="200">
<caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" /> <caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -670,8 +467,8 @@ ...@@ -670,8 +467,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Map/PcbOrderInvoiceMap.php"> <entry file="file://$PROJECT_DIR$/app/Map/PcbOrderInvoiceMap.php">
<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="25">
<caret line="3" column="24" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="24" /> <caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -688,7 +485,6 @@ ...@@ -688,7 +485,6 @@
<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>
...@@ -702,16 +498,8 @@ ...@@ -702,16 +498,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.env"> <entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150"> <state relative-caret-position="375">
<caret line="6" column="21" selection-start-line="6" selection-start-column="12" selection-end-line="6" selection-end-column="21" /> <caret line="18" column="14" selection-start-line="17" selection-start-column="0" selection-end-line="22" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="73" column="9" selection-start-line="73" selection-start-column="8" selection-end-line="73" selection-end-column="9" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -728,15 +516,6 @@ ...@@ -728,15 +516,6 @@
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="875">
<caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -744,7 +523,6 @@ ...@@ -744,7 +523,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="767"> <state relative-caret-position="767">
<caret line="53" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <caret line="53" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -756,14 +534,6 @@ ...@@ -756,14 +534,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Map/PcbOrderShippingMap.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="25" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="25" />
<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="509"> <state relative-caret-position="509">
...@@ -792,209 +562,206 @@ ...@@ -792,209 +562,206 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/website.php"> <entry file="file://$PROJECT_DIR$/public/js/common.min.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425"> <state relative-caret-position="500">
<caret line="17" column="15" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="15" /> <caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/params.php"> <entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50"> <state relative-caret-position="583">
<caret line="2" column="20" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="20" /> <caret line="25" column="19" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="19" />
<folding /> <folding>
<element signature="e#33#45#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/common.min.js"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500"> <state relative-caret-position="408">
<caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" /> <caret line="32" column="56" selection-start-line="32" selection-start-column="56" selection-end-line="32" selection-end-column="56" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php"> <entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="608"> <state relative-caret-position="417">
<caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" /> <caret line="28" column="40" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="40" />
<folding>
<element signature="e#33#45#0#PHP" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <entry file="file://$PROJECT_DIR$/resources/views/PaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309"> <state relative-caret-position="525">
<caret line="66" column="40" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" /> <caret line="27" column="40" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="583"> <state relative-caret-position="367">
<caret line="25" column="19" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="19" /> <caret line="27" column="40" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="40" />
<folding>
<element signature="e#33#45#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.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="-3200"> <state relative-caret-position="350">
<caret line="34" column="44" selection-start-line="34" selection-start-column="44" selection-end-line="34" selection-end-column="44" /> <caret line="14" column="81" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408"> <state relative-caret-position="2584">
<caret line="32" column="56" selection-start-line="32" selection-start-column="56" selection-end-line="32" selection-end-column="56" /> <caret line="173" column="68" selection-start-line="173" selection-start-column="57" selection-end-line="173" selection-end-column="68" />
<folding> <folding />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="617"> <state relative-caret-position="-3466">
<caret line="85" column="44" selection-start-line="85" selection-start-column="44" selection-end-line="85" selection-end-column="44" /> <caret line="144" column="29" selection-start-line="144" selection-start-column="29" selection-end-line="144" selection-end-column="29" />
<folding> <folding />
<element signature="e#33#57#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php"> <entry file="file://$PROJECT_DIR$/app/Http/Function.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="619">
<caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" /> <caret line="211" column="19" selection-start-line="211" selection-start-column="15" selection-end-line="211" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js"> <entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="417"> <state relative-caret-position="508">
<caret line="28" column="40" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="40" /> <caret line="98" column="35" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php"> <entry file="file://$PROJECT_DIR$/app/Map/PcbOrderShippingMap.php">
<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="25">
<caret line="12" column="63" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" /> <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<folding> <folding />
<element signature="n#style#0;n#h2#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="e#5554#5560#0#HTML" expanded="true" />
<element signature="e#5560#5566#0#HTML" expanded="true" />
<element signature="e#5566#5572#0#HTML" expanded="true" />
<element signature="e#5572#5578#0#HTML" expanded="true" />
<element signature="e#5578#5584#0#HTML" expanded="true" />
<element signature="e#5584#5590#0#HTML" expanded="true" />
<element signature="e#5590#5596#0#HTML" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#5870#5876#0#HTML" expanded="true" />
<element signature="e#5876#5882#0#HTML" expanded="true" />
<element signature="e#5882#5888#0#HTML" expanded="true" />
<element signature="e#5888#5894#0#HTML" expanded="true" />
<element signature="e#5894#5900#0#HTML" expanded="true" />
<element signature="e#5900#5906#0#HTML" expanded="true" />
<element signature="e#5906#5912#0#HTML" expanded="true" />
<element signature="e#5912#5918#0#HTML" expanded="true" />
<element signature="e#5923#5929#0#HTML" expanded="true" />
<element signature="e#5929#5935#0#HTML" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#6107#6113#0#HTML" expanded="true" />
<element signature="e#6113#6119#0#HTML" expanded="true" />
<element signature="e#6119#6125#0#HTML" expanded="true" />
<element signature="e#6125#6131#0#HTML" expanded="true" />
<element signature="n#style#0;n#button#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays.blade.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="525"> <state relative-caret-position="250">
<caret line="27" column="40" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="40" /> <caret line="10" column="30" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="32" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb.blade.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367"> <state relative-caret-position="150">
<caret line="27" column="40" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="40" /> <caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php"> <entry file="file://$PROJECT_DIR$/app/Map/PcbOrderMap.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350"> <state relative-caret-position="25">
<caret line="14" column="81" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" /> <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<folding> <folding />
<element signature="n#style#0;n#fieldset#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php"> <entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2584"> <state relative-caret-position="100">
<caret line="173" column="68" selection-start-line="173" selection-start-column="57" selection-end-line="173" selection-end-column="68" /> <caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.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="-3466"> <state relative-caret-position="425">
<caret line="144" column="29" selection-start-line="144" selection-start-column="29" selection-end-line="144" selection-end-column="29" /> <caret line="17" column="15" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="15" />
<folding> <folding />
<marker date="1545708398296" expanded="true" signature="1533:1578" ph="..." />
<marker date="1545708398296" expanded="true" signature="2256:2300" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Function.php"> <entry file="file://$PROJECT_DIR$/config/params.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="619"> <state relative-caret-position="200">
<caret line="211" column="19" selection-start-line="211" selection-start-column="15" selection-end-line="211" selection-end-column="19" /> <caret line="8" column="37" selection-start-line="2" selection-start-column="5" selection-end-line="13" selection-end-column="10" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php"> <entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<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="250"> <state relative-caret-position="250">
<caret line="10" column="30" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="32" /> <caret line="62" column="55" selection-start-line="62" selection-start-column="55" selection-end-line="62" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php"> <entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432"> <state relative-caret-position="-1775">
<caret line="175" column="54" selection-start-line="175" selection-start-column="54" selection-end-line="175" selection-end-column="54" /> <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding> <folding>
<element signature="e#40#71#0#PHP" expanded="true" /> <element signature="e#33#57#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508">
<caret line="72" column="39" selection-start-line="72" selection-start-column="38" selection-end-line="72" selection-end-column="48" />
<folding>
<element signature="e#33#64#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="93" column="48" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
<folding>
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="203" column="41" selection-start-line="203" selection-start-column="41" selection-end-line="203" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
app/Model/Pcb/PcbPublicModel.php
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace App\Model\Pcb; namespace App\Model\Pcb;
use League\Flysystem\Exception;
use Request; use Request;
use DB; use DB;
...@@ -43,7 +44,7 @@ class PcbPublicModel ...@@ -43,7 +44,7 @@ class PcbPublicModel
* 插入后台客服审核结果 * 插入后台客服审核结果
*/ */
public function orderShipping($user_id,$data){ public function orderShipping($user_id,$data){
$con = DB::connection('pcb');
$datas = [ $datas = [
'shipping_type'=>1, 'shipping_type'=>1,
'relevance_id'=>$data['order_id'], 'relevance_id'=>$data['order_id'],
...@@ -53,21 +54,34 @@ class PcbPublicModel ...@@ -53,21 +54,34 @@ class PcbPublicModel
'shipping_id'=>$data['shipping_id'], 'shipping_id'=>$data['shipping_id'],
'status'=>1, 'status'=>1,
'update_time'=>time(), 'update_time'=>time(),
'create_time'=>time(),
]; ];
$shippingCon = $con->table("shipping");
$checkHave =$shippingCon->where(['relevance_id'=>$data['order_id'],'shipping_type'=>1])->first();
if ($checkHave){ try{
$in = $shippingCon->where(['relevance_id'=>$data['order_id'],'shipping_type'=>1])->update($datas); $con = DB::connection('pcb');
}else{ $con->beginTransaction();
$data['create_time'] = time();
//插入物流信息
$shippingCon = $con->table("shipping");
$in = $shippingCon->insert($datas); $in = $shippingCon->insert($datas);
if (!$in){
throw new Exception("插入发货信息失败");
} }
if ($in){ //修改发货时间
$updete = (new PcbOrderModel())->where("order_id",$data['order_id'])->update(['shipping_time'=>time()]);
if (!$updete){
throw new Exception("更新订单发货时间失败");
}
//日志
PcbActionLogModel::log(1,'admin_add_shipping',"后台填写发货信息","",$data['order_id'],$user_id); PcbActionLogModel::log(1,'admin_add_shipping',"后台填写发货信息","",$data['order_id'],$user_id);
return [0,'成功'];
}else{ $con->commit();
return [1001,'失败'];
return [0, '成功'];
}catch (\Exception $e) {
$con->rollBack();
return [10002, '失败'.$e->getMessage()];
} }
} }
......
public/js/PcbOrderList.js
...@@ -156,6 +156,10 @@ layui.use(['table','form','element','layer', 'laydate'], function() { ...@@ -156,6 +156,10 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
//确定发货 //确定发货
function SendStock() { function SendStock() {
layer.msg('加载中', {
icon: 16
,shade: 0.01
});
$.ajax({ $.ajax({
url:'/api/ApiSendStock', url:'/api/ApiSendStock',
type:'post', type:'post',
...@@ -171,12 +175,19 @@ function SendStock() { ...@@ -171,12 +175,19 @@ function SendStock() {
}else{ }else{
alert_err(res.errmsg) alert_err(res.errmsg)
} }
},
done:function () {
layer.closeAll();
} }
}) })
} }
//转采购 //转采购
function AddPurchase(order_id) { function AddPurchase(order_id) {
alert_confirm("确定填写此订单转采购？",function () { alert_confirm("确定填写此订单转采购？",function () {
layer.msg('加载中', {
icon: 16
,shade: 0.01
});
$.ajax({ $.ajax({
url:'/api/ApiAddPurchase', url:'/api/ApiAddPurchase',
type:'post', type:'post',
...@@ -190,8 +201,11 @@ function AddPurchase(order_id) { ...@@ -190,8 +201,11 @@ function AddPurchase(order_id) {
window.location.href = "/web/PcbPurchaseList" window.location.href = "/web/PcbPurchaseList"
}) })
}else{ }else{
alert_err(res.errmsg) alert_err(res.err_msg)
} }
},
done:function () {
layer.closeAll();
} }
}) })
}) })
......
resources/views/Pcb/PcbOrderList.blade.php
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
@{{# if(d.status==1){ }} @{{# if(d.status==1){ }}
<button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.order_id }}" order_sn="@{{ d.order_sn }}" onclick="AddPurchase(@{{ d.order_id }})">发起采购</button> <button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.order_id }}" order_sn="@{{ d.order_sn }}" onclick="AddPurchase(@{{ d.order_id }})">发起采购</button>
@{{# } }} @{{# } }}
@{{# if(d.status==14){ }} @{{# if(d.status==14 && d.shipping_time == 0){ }}
<button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.order_id }}" order_sn="@{{ d.order_sn }}" lay-filter="SendPurchase">发货</button> <button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.order_id }}" order_sn="@{{ d.order_sn }}" lay-filter="SendPurchase">发货</button>
@{{# } }} @{{# } }}
</script> </script>
......
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