Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 17995b8b by PRY5YKGJ82EZEPX\Administrator
Options

更新pcb后台

parent 0a66d671
Inline Side-by-side
Showing with 413 additions and 282 deletions
.idea/workspace.xml
...@@ -5,9 +5,19 @@ ...@@ -5,9 +5,19 @@
</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/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/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/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/PcbPurchaseList.js" afterPath="$PROJECT_DIR$/public/js/PcbPurchaseList.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/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/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" /> <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" />
...@@ -29,109 +39,127 @@ ...@@ -29,109 +39,127 @@
</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="ApiController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="WebController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="708">
<caret line="81" column="36" selection-start-line="81" selection-start-column="21" selection-end-line="81" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PcbServerModel.php" pinned="false" current-in-tab="false">
<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="558"> <state relative-caret-position="432">
<caret line="32" column="32" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="32" /> <caret line="175" column="54" selection-start-line="175" selection-start-column="54" selection-end-line="175" selection-end-column="54" />
<folding> <folding>
<element signature="e#33#45#0#PHP" expanded="true" /> <element signature="e#40#71#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="WebController.php" pinned="false" current-in-tab="false"> <file leaf-file-name="header.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/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="303"> <state relative-caret-position="250">
<caret line="104" column="62" selection-start-line="104" selection-start-column="62" selection-end-line="104" selection-end-column="62" /> <caret line="10" column="30" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="32" />
<folding> <folding />
<element signature="e#40#71#0#PHP" expanded="true" />
<element signature="e#323#1210#0#PHP" expanded="false" />
</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="Function.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.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="434"> <state relative-caret-position="619">
<caret line="179" column="66" selection-start-line="179" selection-start-column="56" selection-end-line="179" selection-end-column="66" /> <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>
</file> </file>
<file leaf-file-name="params.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$/config/params.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="50"> <state relative-caret-position="350">
<caret line="2" column="20" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="20" /> <caret line="14" column="81" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding /> <folding>
<element signature="n#style#0;n#fieldset#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PcbPurchaseList.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PcbOrderDetail.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.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="583"> <state relative-caret-position="-3466">
<caret line="90" column="23" selection-start-line="90" selection-start-column="23" selection-end-line="90" selection-end-column="23" /> <caret line="144" column="29" selection-start-line="144" selection-start-column="29" selection-end-line="144" selection-end-column="29" />
<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>
</file> </file>
<file leaf-file-name="PcbPurchaseList.js" pinned="false" current-in-tab="true"> <file leaf-file-name="PcbPurchaseDetail.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js"> <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="442"> <state relative-caret-position="2584">
<caret line="123" column="35" selection-start-line="123" selection-start-column="35" selection-end-line="123" selection-end-column="35" /> <caret line="173" column="68" selection-start-line="173" selection-start-column="57" selection-end-line="173" selection-end-column="68" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="common.min.js" pinned="false" current-in-tab="false"> <file leaf-file-name="PcbPurchaseModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/common.min.js"> <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="500"> <state relative-caret-position="675">
<caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" /> <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PcbPurchaseModel.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PcbPurchaseList.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.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="325"> <state relative-caret-position="417">
<caret line="73" column="35" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" /> <caret line="28" column="40" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="PcbOrderDetail.blade.php" pinned="false" current-in-tab="false"> <file leaf-file-name="PcbOrderList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php">
<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="300">
<caret line="86" column="28" selection-start-line="86" selection-start-column="28" selection-end-line="86" selection-end-column="28" /> <caret line="12" column="63" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" />
<folding> <folding>
<marker date="1545699706429" expanded="true" signature="1533:1578" ph="..." /> <element signature="n#style#0;n#h2#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<marker date="1545699706429" expanded="true" signature="2256:2300" ph="..." /> <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>
...@@ -175,27 +203,27 @@ ...@@ -175,27 +203,27 @@
<option value="$PROJECT_DIR$/config/database.php" /> <option value="$PROJECT_DIR$/config/database.php" />
<option value="$PROJECT_DIR$/app/Map/PcbOrderMap.php" /> <option value="$PROJECT_DIR$/app/Map/PcbOrderMap.php" />
<option value="$PROJECT_DIR$/public/js/common.min.js" /> <option value="$PROJECT_DIR$/public/js/common.min.js" />
<option value="$PROJECT_DIR$/app/Http/Function.php" />
<option value="$PROJECT_DIR$/app/Map/PcbOrderInvoiceMap.php" /> <option value="$PROJECT_DIR$/app/Map/PcbOrderInvoiceMap.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/RegionController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/RegionController.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb.blade.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php" /> <option value="$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php" />
<option value="$PROJECT_DIR$/config/website.php" /> <option value="$PROJECT_DIR$/config/website.php" />
<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$/resources/views/Pcb/PcbOrderList.blade.php" /> <option value="$PROJECT_DIR$/config/params.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" /> <option value="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" />
<option value="$PROJECT_DIR$/public/js/PcbOrderList.js" /> <option value="$PROJECT_DIR$/public/js/PcbOrderList.js" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.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$/config/params.php" /> <option value="$PROJECT_DIR$/public/js/PcbPurchaseList.js" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" /> <option value="$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb.blade.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php" /> <option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.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/Controllers/WebController.php" /> <option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" />
<option value="$PROJECT_DIR$/public/js/PcbPurchaseList.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -253,7 +281,114 @@ ...@@ -253,7 +281,114 @@
</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" />
...@@ -338,19 +473,19 @@ ...@@ -338,19 +473,19 @@
<workItem from="1539327663189" duration="3659000" /> <workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="2229000" /> <workItem from="1539332944482" duration="2229000" />
<workItem from="1545360823838" duration="125000" /> <workItem from="1545360823838" duration="125000" />
<workItem from="1545360991555" duration="66537000" /> <workItem from="1545360991555" duration="74146000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="108544000" /> <option name="totallyTimeSpent" value="116153000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> <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="false" show_stripe_button="true" weight="0.2677502" 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="true" 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" />
...@@ -371,29 +506,6 @@ ...@@ -371,29 +506,6 @@
<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.2677502" 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="false" 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" />
...@@ -416,22 +528,6 @@ ...@@ -416,22 +528,6 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="867">
<caret line="68" column="17" selection-start-line="68" selection-start-column="17" selection-end-line="68" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Page.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-92">
<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/selfOrder/content.blade.php"> <entry file="file://$PROJECT_DIR$/resources/views/selfOrder/content.blade.php">
<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">
...@@ -480,14 +576,6 @@ ...@@ -480,14 +576,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="31" column="45" selection-start-line="31" selection-start-column="34" selection-end-line="31" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<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="400"> <state relative-caret-position="400">
...@@ -604,14 +692,6 @@ ...@@ -604,14 +692,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="583">
<caret line="40" column="41" selection-start-line="40" selection-start-column="41" selection-end-line="40" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/RegionController.php"> <entry file="file://$PROJECT_DIR$/app/Http/Controllers/RegionController.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1100"> <state relative-caret-position="1100">
...@@ -660,14 +740,6 @@ ...@@ -660,14 +740,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderDetail.js"> <entry file="file://$PROJECT_DIR$/public/js/PcbOrderDetail.js">
<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">
...@@ -692,183 +764,235 @@ ...@@ -692,183 +764,235 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.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="453"> <state relative-caret-position="509">
<caret line="101" column="74" selection-start-line="101" selection-start-column="63" selection-end-line="101" selection-end-column="74" /> <caret line="1217" column="66" selection-start-line="1217" selection-start-column="51" selection-end-line="1217" selection-end-column="66" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" /> <element signature="e#39#67#0#PHP" expanded="true" />
<element signature="e#5575#5581#0#HTML" expanded="true" /> <marker date="1545370203471" expanded="true" signature="14178:14278" ph="SELECT * FRO... department" />
<element signature="e#5581#5587#0#HTML" expanded="true" /> <marker date="1545370203471" expanded="true" signature="14219:14277" ph="SELECT depar... department" />
<element signature="e#5587#5593#0#HTML" expanded="true" />
<element signature="e#5593#5599#0#HTML" expanded="true" />
<element signature="e#5604#5610#0#HTML" expanded="true" />
<element signature="e#5610#5616#0#HTML" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<marker date="1545637941263" expanded="true" signature="5873:5879" ph=" " />
<marker date="1545637941263" expanded="true" signature="5879:5885" ph=" " />
<marker date="1545637941263" expanded="true" signature="5885:5891" ph=" " />
<marker date="1545637941263" expanded="true" signature="5891:5897" ph=" " />
<marker date="1545637941263" expanded="true" signature="5902:5908" ph=" " />
<marker date="1545637941263" expanded="true" signature="5908:5914" ph=" " />
<marker date="1545637941263" expanded="true" signature="5957:5983" ph="..." />
<marker date="1545637941263" expanded="true" signature="6086:6092" ph=" " />
<marker date="1545637941263" expanded="true" signature="6092:6098" ph=" " />
<marker date="1545637941263" expanded="true" signature="6098:6104" ph=" " />
<marker date="1545637941263" expanded="true" signature="6104:6110" ph=" " />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.js"> <entry file="file://$PROJECT_DIR$/config/queue.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="392"> <state relative-caret-position="0">
<caret line="169" column="37" selection-start-line="169" selection-start-column="37" selection-end-line="169" selection-end-column="37" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.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="8"> <state relative-caret-position="-1800">
<caret line="89" column="21" selection-start-line="89" selection-start-column="21" selection-end-line="89" selection-end-column="21" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding />
<element signature="e#33#57#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.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="509"> <state relative-caret-position="425">
<caret line="1217" column="66" selection-start-line="1217" selection-start-column="51" selection-end-line="1217" selection-end-column="66" /> <caret line="17" column="15" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="15" />
<folding> <folding />
<element signature="e#39#67#0#PHP" expanded="true" />
<marker date="1545370203471" expanded="true" signature="14178:14278" ph="SELECT * FRO... department" />
<marker date="1545370203471" expanded="true" signature="14219:14277" ph="SELECT depar... department" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/queue.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="0"> <state relative-caret-position="50">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="2" column="20" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/app.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="-1800"> <state relative-caret-position="500">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.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="142"> <state relative-caret-position="608">
<caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" /> <caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" />
<folding> <folding>
<element signature="e#33#45#0#PHP" expanded="true" /> <element signature="e#33#45#0#PHP" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="309">
<caret line="66" column="40" selection-start-line="66" selection-start-column="40" selection-end-line="66" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.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="558"> <state relative-caret-position="583">
<caret line="32" column="32" selection-start-line="32" selection-start-column="20" selection-end-line="32" selection-end-column="32" /> <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" /> <element signature="e#33#45#0#PHP" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"> <entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="708"> <state relative-caret-position="-3200">
<caret line="81" column="36" selection-start-line="81" selection-start-column="21" selection-end-line="81" selection-end-column="36" /> <caret line="34" column="44" selection-start-line="34" selection-start-column="44" selection-end-line="34" selection-end-column="44" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="32" column="56" selection-start-line="32" selection-start-column="56" selection-end-line="32" selection-end-column="56" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="617">
<caret line="85" column="44" selection-start-line="85" selection-start-column="44" selection-end-line="85" selection-end-column="44" />
<folding>
<element signature="e#33#57#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php"> <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="325"> <state relative-caret-position="675">
<caret line="73" column="35" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" /> <caret line="66" column="13" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/website.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="425"> <state relative-caret-position="417">
<caret line="17" column="15" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="15" /> <caret line="28" column="40" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/config/params.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.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="300">
<caret line="2" column="20" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="20" /> <caret line="12" column="63" selection-start-line="12" selection-start-column="63" selection-end-line="12" selection-end-column="63" />
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<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$/resources/views/Pcb/PcbPurchaseDetail.blade.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="434"> <state relative-caret-position="367">
<caret line="179" column="66" selection-start-line="179" selection-start-column="56" selection-end-line="179" selection-end-column="66" /> <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$/resources/views/Pcb/PcbOrderDetail.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="575"> <state relative-caret-position="350">
<caret line="86" column="28" selection-start-line="86" selection-start-column="28" selection-end-line="86" selection-end-column="28" /> <caret line="14" column="81" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding> <folding>
<marker date="1545699706429" expanded="true" signature="1533:1578" ph="..." /> <element signature="n#style#0;n#fieldset#0;n#div#0;n#!!top" expanded="true" />
<marker date="1545699706429" expanded="true" signature="2256:2300" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php"> <entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php">
<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>
<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="303"> <state relative-caret-position="-3466">
<caret line="104" column="62" selection-start-line="104" selection-start-column="62" selection-end-line="104" selection-end-column="62" /> <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#40#71#0#PHP" expanded="true" /> <marker date="1545708398296" expanded="true" signature="1533:1578" ph="..." />
<element signature="e#323#1210#0#PHP" expanded="false" /> <marker date="1545708398296" expanded="true" signature="2256:2300" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.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="583"> <state relative-caret-position="619">
<caret line="90" column="23" selection-start-line="90" selection-start-column="23" selection-end-line="90" selection-end-column="23" /> <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/common.min.js"> <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="500"> <state relative-caret-position="250">
<caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" /> <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$/public/js/PcbPurchaseList.js"> <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="442"> <state relative-caret-position="432">
<caret line="123" column="35" selection-start-line="123" selection-start-column="35" selection-end-line="123" selection-end-column="35" /> <caret line="175" column="54" selection-start-line="175" selection-start-column="54" selection-end-line="175" selection-end-column="54" />
<folding /> <folding>
<element signature="e#40#71#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
app/Http/Controllers/ApiController.php
...@@ -64,7 +64,7 @@ class ApiController extends Controller ...@@ -64,7 +64,7 @@ class ApiController extends Controller
} }
//pcb客服点击转采购 //pcb客服点击转采购
private function ApiAddPurchase($request){ private function ApiAddPurchase($request){
$this->Export((new PcbServerModel())->AddPurchase($request->user->userId,$request->input("order_id"))); echo (new PcbServerModel())->AddPurchase($request->user->userId,$request->input("order_id"));
} }
//pcb客服审核订单，反馈给前台 //pcb客服审核订单，反馈给前台
private function ApiAuditOrder($request){ private function ApiAuditOrder($request){
...@@ -80,6 +80,6 @@ class ApiController extends Controller ...@@ -80,6 +80,6 @@ class ApiController extends Controller
} }
//pcb后台点击采购确认 //pcb后台点击采购确认
private function ApiConfirmOrder($request){ private function ApiConfirmOrder($request){
$this->Export((new PcbServerModel())->confirmOrder($request->user->userId,$request->input("purchase_id"))); echo (new PcbServerModel())->confirmOrder($request->user->userId,$request->input("purchase_id"));
} }
} }
app/Http/Controllers/WebController.php
...@@ -80,6 +80,7 @@ class WebController extends Controller ...@@ -80,6 +80,7 @@ class WebController extends Controller
//pcb详情 //pcb详情
private function PcbOrderDetail($request,$data,$id){ private function PcbOrderDetail($request,$data,$id){
$data['title']='PCB订单详情'; $data['title']='PCB订单详情';
$data['paths'] = [["title" => 'PCB管理', "href" => '#'], ["title" => 'PCB订单列表', "href" => '/web/PcbOrderList'], ["title" => 'PCB订单详情', "href" => '#']];
$order_id = $request->input("order_id"); $order_id = $request->input("order_id");
$con = DB::connection('pcb'); $con = DB::connection('pcb');
//订单基本信息 //订单基本信息
...@@ -106,12 +107,20 @@ class WebController extends Controller ...@@ -106,12 +107,20 @@ class WebController extends Controller
//查询操作日志 //查询操作日志
$actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get(); $actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get();
//拼接基本信息
$orderBase = objectToArray($orderBase); $orderBase = objectToArray($orderBase);
$orderBase['tiaojia'] = ""; $orderBase['tiaojia'] = "";
if (!$purchase){ //拼接采购信息
$orderBase['tiaojia'] = $purchase['purchase_amount'] != $purchase['order_amount'] ? "是" :"否"; //是否调价、 if ($purchase){
$purchase= objectToArray($purchase);
if ( $purchase['purchase_amount'] > 0 && $purchase['purchase_amount'] != $purchase['order_amount']){
$orderBase['tiaojia'] = "是";
}else{
$orderBase['tiaojia'] = "否";
}
$purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
$purchase['finish_time'] = $purchase['finish_time'] > 0 ? date('Y-m-d H:i:s',$purchase['finish_time']) : "";
} }
//拼接基本信息
$orderBase['order_pay_type'] = PcbOrderMap::$order_pay_type[$orderBase['order_pay_type']]; $orderBase['order_pay_type'] = PcbOrderMap::$order_pay_type[$orderBase['order_pay_type']];
$orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']]; $orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
$orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']]; $orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
...@@ -135,11 +144,6 @@ class WebController extends Controller ...@@ -135,11 +144,6 @@ class WebController extends Controller
$orderInvoice['inv_type'] = PcbOrderInvoiceMap::$inv_type[$orderInvoice['inv_type']]; $orderInvoice['inv_type'] = PcbOrderInvoiceMap::$inv_type[$orderInvoice['inv_type']];
$orderInvoice['invoice_status'] = PcbOrderInvoiceMap::$invoice_status[$orderInvoice['invoice_status']]; $orderInvoice['invoice_status'] = PcbOrderInvoiceMap::$invoice_status[$orderInvoice['invoice_status']];
} }
//拼接采购信息
if ($purchase){
$purchase = objectToArray($purchase);
$purchase['shipping_time'] = $purchase['shipping_time'] > 0 ? date('Y-m-d H:i:s',$purchase['shipping_time']) : "";
}
//拼接订单详细信息 //拼接订单详细信息
$orderInfo = objectToArray($orderInfo); $orderInfo = objectToArray($orderInfo);
$orderInfo['teshu'] = ($orderInfo['sp_half_hole'] == 1 ? "是":"否").($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺 $orderInfo['teshu'] = ($orderInfo['sp_half_hole'] == 1 ? "是":"否").($orderInfo['sp_goldfingers'] == 1 ? "是":"否").$orderInfo['sp_goldfingers_bevelling'].$orderInfo['sp_UL_marking']; //特殊工艺
...@@ -167,6 +171,8 @@ class WebController extends Controller ...@@ -167,6 +171,8 @@ class WebController extends Controller
//pcb详情 //pcb详情
private function PcbPurchaseDetail($request,$data,$id){ private function PcbPurchaseDetail($request,$data,$id){
$data['title']='PCB采购详情'; $data['title']='PCB采购详情';
$data['paths'] = [["title" => 'PCB管理', "href" => '#'], ["title" => 'PCB采购列表', "href" => '/web/PcbPurchaseList'], ["title" => 'PCB采购详情', "href" => '#']];
$purchase_id = $request->input("purchase_id"); $purchase_id = $request->input("purchase_id");
$order_id = $request->input("order_id"); $order_id = $request->input("order_id");
......
app/Http/Function.php
...@@ -208,6 +208,7 @@ ...@@ -208,6 +208,7 @@
$ret .= '<li><a href="#">' . $menus[$actives[0]]->title . '</a></li>'; $ret .= '<li><a href="#">' . $menus[$actives[0]]->title . '</a></li>';
} }
} }
return $ret; return $ret;
} }
......
app/Model/Pcb/PcbOrderModel.php
...@@ -77,8 +77,12 @@ class PcbOrderModel extends Model ...@@ -77,8 +77,12 @@ class PcbOrderModel extends Model
$puchase = $PcbPurchaseModel->where("order_id",$v['order_id'])->first(); $puchase = $PcbPurchaseModel->where("order_id",$v['order_id'])->first();
$v['tiaojia']=$v['purchase_amount'] = $v['purchase_sn'] = ""; $v['tiaojia']=$v['purchase_amount'] = $v['purchase_sn'] = "";
if ($puchase){ if ($puchase){
$v['tiaojia'] = $puchase['purchase_amount'] != $v['order_amount'] ? "是" :"否"; //是否调价、 if ( $puchase['purchase_amount'] > 0 && $puchase['purchase_amount'] != $v['order_amount']){
$v['purchase_amount'] = $puchase['purchase_amount']; $v['tiaojia'] = "是";
}else{
$v['tiaojia'] = "否";
}
$v['purchase_amount'] = $puchase['purchase_amount'] > 0 ? $puchase['purchase_amount'] : "";
$v['purchase_sn'] = $puchase['purchase_sn']; $v['purchase_sn'] = $puchase['purchase_sn'];
} }
......
app/Model/Pcb/PcbPublicModel.php
...@@ -44,25 +44,24 @@ class PcbPublicModel ...@@ -44,25 +44,24 @@ class PcbPublicModel
*/ */
public function orderShipping($user_id,$data){ public function orderShipping($user_id,$data){
$con = DB::connection('pcb'); $con = DB::connection('pcb');
$data = [ $datas = [
'order_id'=>$data['order_id'], 'shipping_type'=>1,
'order_sn'=>$data['order_sn'], 'relevance_id'=>$data['order_id'],
'order_shipping_type'=>1, 'relevance_sn'=>$data['order_sn'],
'shipping_no'=>$data['shipping_no'], 'shipping_no'=>$data['shipping_no'],
'shipping_name'=>$data['shipping_name'], 'shipping_name'=>$data['shipping_name'],
'shipping_id'=>$data['shipping_id'], 'shipping_id'=>$data['shipping_id'],
'shipping_type'=>1,
'status'=>1, 'status'=>1,
'update_time'=>time(), 'update_time'=>time(),
]; ];
$shippingCon = $con->table("order_shipping"); $shippingCon = $con->table("shipping");
$checkHave =$shippingCon->where(['order_id'=>$data['order_id'],'shipping_type'=>1])->first(); $checkHave =$shippingCon->where(['relevance_id'=>$data['order_id'],'shipping_type'=>1])->first();
if ($checkHave){ if ($checkHave){
$in = $shippingCon->where(['order_id'=>$data['order_id'],'shipping_type'=>1])->update($data); $in = $shippingCon->where(['relevance_id'=>$data['order_id'],'shipping_type'=>1])->update($datas);
}else{ }else{
$data['create_time'] = time(); $data['create_time'] = time();
$in = $shippingCon->insert($data); $in = $shippingCon->insert($datas);
} }
if ($in){ if ($in){
PcbActionLogModel::log(1,'admin_add_shipping',"后台填写发货信息","",$data['order_id'],$user_id); PcbActionLogModel::log(1,'admin_add_shipping',"后台填写发货信息","",$data['order_id'],$user_id);
......
app/Model/Pcb/PcbPurchaseModel.php
...@@ -23,7 +23,6 @@ class PcbPurchaseModel extends Model ...@@ -23,7 +23,6 @@ class PcbPurchaseModel extends Model
// //查询数据\ // //查询数据\
$list = $this->where(function ($query) use ($input) { $list = $this->where(function ($query) use ($input) {
$PcbPurchaseModel = new PcbPurchaseModel();
foreach ($input as $k => $v){ foreach ($input as $k => $v){
$v = trim($v); $v = trim($v);
switch ($k){ switch ($k){
...@@ -38,24 +37,12 @@ class PcbPurchaseModel extends Model ...@@ -38,24 +37,12 @@ class PcbPurchaseModel extends Model
case "end_time": case "end_time":
$query->where('create_time', '<=',strtotime($v)); $query->where('create_time', '<=',strtotime($v));
break; break;
case "end_time":
$query->where('create_time', '<=',strtotime($v));
break;
case "purchase_sn":
$items = $PcbPurchaseModel->select("order_id")->where("purchase_sn","like","%".$v."%")->get();
if ($items->count()){
$orderIds = arrayToCommaStr($items->toArray(),'order_id',1);
$query->whereIn("order_id",$orderIds);
}else{
$query->where("order_id",0);
}
break;
default: default:
$query->whereIn($k, explode(',',trim($v,','))); $query->whereIn($k, explode(',',trim($v,',')));
break; break;
} }
} }
})->orderBy('order_id','desc'); })->orderBy('purchase_id','desc');
//getSql(); //getSql();
if ($type == 1){ if ($type == 1){
$list = $list->paginate($input['limit'], ['*'], 'p', $input['p'])->toArray(); $list = $list->paginate($input['limit'], ['*'], 'p', $input['p'])->toArray();
...@@ -73,7 +60,12 @@ class PcbPurchaseModel extends Model ...@@ -73,7 +60,12 @@ class PcbPurchaseModel extends Model
} }
foreach ($data as $k=>&$v){ foreach ($data as $k=>&$v){
//查询采购 //查询采购
$v['tiaojia'] = $v['purchase_amount'] != $v['order_amount'] ? "是" :"否"; //是否调价、 if ($v['purchase_amount'] > 0){
$v['tiaojia'] = $v['purchase_amount'] != $v['order_amount'] ? "是" :"否"; //是否调价
}else{
$v['tiaojia'] = $v['purchase_amount'] = "";
}
$v['order_pay_type'] = PcbOrderMap::$order_pay_type[$v['order_pay_type']]; $v['order_pay_type'] = PcbOrderMap::$order_pay_type[$v['order_pay_type']];
$v['order_type'] = PcbOrderMap::$order_type[$v['order_type']]; $v['order_type'] = PcbOrderMap::$order_type[$v['order_type']];
$v['status_name'] = PcbOrderMap::$status[$v['status']]; $v['status_name'] = PcbOrderMap::$status[$v['status']];
...@@ -87,6 +79,7 @@ class PcbPurchaseModel extends Model ...@@ -87,6 +79,7 @@ class PcbPurchaseModel extends Model
$data = $this->getList(2); $data = $this->getList(2);
$column = array('ID','会员账号','交易订单编号','采购订单编号','是否调价','订单金额','调整后订单金额','订单状态','订单类型','支付方式','下单时间'); // 表头 $column = array('ID','会员账号','交易订单编号','采购订单编号','是否调价','订单金额','调整后订单金额','订单状态','订单类型','支付方式','下单时间'); // 表头
$fileName = 'PCB采购列表导出'.date('YmdHis', time()).'.csv'; $fileName = 'PCB采购列表导出'.date('YmdHis', time()).'.csv';
$temp = []; $temp = [];
foreach ($data as $k=>$v){ foreach ($data as $k=>$v){
array_push($temp,[ array_push($temp,[
......
app/Model/Pcb/PcbServerModel.php
...@@ -23,7 +23,7 @@ class PcbServerModel ...@@ -23,7 +23,7 @@ class PcbServerModel
'order_id'=>$order_id, 'order_id'=>$order_id,
]; ];
$res = curlApi($this->PcbUrl.'/pcb/adminapi/addPurchase',$param,'POST'); $res = curlApi($this->PcbUrl.'/pcb/adminapi/addPurchase',$param,'POST');
return json_decode($res); return $res;
} }
/* /*
* *
...@@ -39,6 +39,6 @@ class PcbServerModel ...@@ -39,6 +39,6 @@ class PcbServerModel
if ($json['err_code'] == 0){ if ($json['err_code'] == 0){
PcbActionLogModel::log(1,'confirm_order',"采购确认","",$purchase_id,$admin_id); PcbActionLogModel::log(1,'confirm_order',"采购确认","",$purchase_id,$admin_id);
} }
return $json; return $res;
} }
} }
\ No newline at end of file
public/js/PcbOrderList.js
...@@ -31,6 +31,8 @@ layui.use(['table','form','element','layer', 'laydate'], function() { ...@@ -31,6 +31,8 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
,{field:'order_type', title: '订单类型',width:160,align:'center'} ,{field:'order_type', title: '订单类型',width:160,align:'center'}
,{field:'order_pay_type', title: '支付方式',width:160,align:'center'} ,{field:'order_pay_type', title: '支付方式',width:160,align:'center'}
,{field:'create_time', title: '下单时间',width:160,align:'center'} ,{field:'create_time', title: '下单时间',width:160,align:'center'}
,{field:'adtag', title: 'adtag',width:160,align:'center'}
,{field:'ptag', title: 'ptag',width:160,align:'center'}
,{field:'cahe', title: '操作',templet:'#cahe',width:150,align:'center', fixed: 'right'} ,{field:'cahe', title: '操作',templet:'#cahe',width:150,align:'center', fixed: 'right'}
]] ]]
,page:{ } ,page:{ }
...@@ -162,9 +164,9 @@ function SendStock() { ...@@ -162,9 +164,9 @@ function SendStock() {
dataType:'json', dataType:'json',
timeout:10000, timeout:10000,
success:function (res) { success:function (res) {
if(res.errcode == 200){ if(res.errcode == 0){
alert_succ(res.errmsg,function () { alert_succ(res.errmsg,function () {
window.location.href='/web/Abnormal'; window.location.href='/web/PcbOrderList';
}) })
}else{ }else{
alert_err(res.errmsg) alert_err(res.errmsg)
......
public/js/PcbPurchaseList.js
...@@ -20,7 +20,7 @@ layui.use(['table','form','element','layer', 'laydate'], function() { ...@@ -20,7 +20,7 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
,last: false //不显示尾页 ,last: false //不显示尾页
,id:'Abnormal' ,id:'Abnormal'
,cols: [[ ,cols: [[
{field:'order_id', title: 'ID',width:120,align:'center'} {field:'purchase_id', title: 'ID',width:120,align:'center'}
,{field:'user_account', title: '会员账号',width:160,align:'center'} ,{field:'user_account', title: '会员账号',width:160,align:'center'}
,{field:'order_sn', title: '交易订单编号',width:160,align:'center'} ,{field:'order_sn', title: '交易订单编号',width:160,align:'center'}
,{field:'purchase_sn', title: '采购订单编号',width:160,align:'center'} ,{field:'purchase_sn', title: '采购订单编号',width:160,align:'center'}
......
resources/views/Pcb/PcbOrderDetail.blade.php
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<th>焊盘喷镀</th> <th>焊盘喷镀</th>
<th>阻焊覆盖</th> <th>阻焊覆盖</th>
<th>内层铜厚</th> <th>内层铜厚</th>
<th>交货时间</th> <th>生产周期</th>
<th>交货日期</th> <th>交货日期</th>
<th></th> <th></th>
</tr> </tr>
...@@ -204,8 +204,8 @@ ...@@ -204,8 +204,8 @@
<td><?= @$orderInfo['surface'] ?></td> <td><?= @$orderInfo['surface'] ?></td>
<td><?= $orderInfo['via_process'] ?></td> <td><?= $orderInfo['via_process'] ?></td>
<td><?= $orderInfo['copper_thickness'] ?></td> <td><?= $orderInfo['copper_thickness'] ?></td>
<td><?= @$orderInfo['finish_time'] ?></td> <td><?= @$orderInfo['days'].'天' ?></td>
<td><?= $purchase['shipping_time'] ?></td> <td><?= $purchase['finish_time'] ?></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -293,12 +293,13 @@ ...@@ -293,12 +293,13 @@
</tbody> </tbody>
</table> </table>
<!--费用信息end--> <!--费用信息end-->
<?Php if(!count($purchase)) { ?>
<div style="margin-top: 10px;margin-bottom: 20px;"> <div style="margin-top: 10px;margin-bottom: 20px;">
<div style=""> <div style="">
<button class="layui-btn export" onclick="AddPurchase()">发起采购</button> <button class="layui-btn export" onclick="AddPurchase()">发起采购</button>
</div> </div>
</div> </div>
<?php } ?>
</div> </div>
......
resources/views/Pcb/PcbOrderList.blade.php
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">下单时间:</label> <label class="layui-form-label">下单时间:</label>
<div class="layui-input-inline" style="width: 200px;"> <div class="layui-input-inline" style="width: 200px;">
<input type="text" name="start_time" id="start_time" value="{{date("Y-m-d 00:00:00",strtotime("-3 month"))}}" placeholder="开始时间" autocomplete="off" class="layui-input"> <input type="text" name="start_time" id="start_time" placeholder="开始时间" autocomplete="off" class="layui-input">
</div> </div>
<div class="layui-form-mid">-</div> <div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 200px;"> <div class="layui-input-inline" style="width: 200px;">
<input type="text" name="end_time" id="end_time" value="{{date("Y-m-d 23:59:59")}}" placeholder="结束时间" autocomplete="off" class="layui-input"> <input type="text" name="end_time" id="end_time" placeholder="结束时间" autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
</div> </div>
...@@ -36,17 +36,17 @@ ...@@ -36,17 +36,17 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">订单状态:</label> <label class="layui-form-label">订单状态:</label>
<div class="layui-input-inline payment-status"> <div class="layui-input-inline">
<input type="hidden" name="status" value=""> <div class="layui-input-inline payment-status" style="width: 800px !important;">
@if(!empty($status) && is_array($status)) <input type="hidden" name="status" value="">
@foreach($status as $k=>$v) @if(!empty($status) && is_array($status))
<input type="checkbox" lay-filter="*" data-type="status" value="{{$k}}" title="{{$v or '未知'}}" > @foreach($status as $k=>$v)
@endforeach <input type="checkbox" lay-filter="*" data-type="status" value="{{$k}}" title="{{$v or '未知'}}" >
@endif @endforeach
@endif
</div>
</div> </div>
</div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<table class="layui-table" lay-filter="test" id="list"></table> <table class="layui-table" lay-filter="test" id="list"></table>
<script type="text/html" id="cahe"> <script type="text/html" id="cahe">
<a href="/web/PcbOrderDetail?order_id=@{{ d.order_id }}" target="_blank" class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a> <a href="/web/PcbOrderDetail?order_id=@{{ d.order_id }}" class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a>
@{{# 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>
@{{# } }} @{{# } }}
...@@ -98,14 +98,14 @@ ...@@ -98,14 +98,14 @@
<!--弹出层--> <!--弹出层-->
<div id="sendPurchase" style="display: none"> <div id="sendPurchase" style="display: none">
<br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;配送快递:&nbsp;&nbsp; <br/><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;配送快递:&nbsp;&nbsp;
<select type='text' style='width: 200px;height: 30px;' id="shipping_id"> <select type='text' style='width: 200px;height: 30px;' id="shipping_id">
<?php foreach($shipping as $k=>$v){ ?> <?php foreach($shipping as $k=>$v){ ?>
<option value="<?= $v['shipping_id']; ?>"><?= $v['shipping_name']; ?></option> <option value="<?= $v['shipping_id']; ?>"><?= $v['shipping_name']; ?></option>
<?php } ?> <?php } ?>
</select><br/><br/> </select><br/><br/>
&nbsp;&nbsp;&nbsp;&nbsp;快递单号:&nbsp;&nbsp;<input type='text' id="shipping_no" style='width: 200px;height: 30px;' ><br/><br/> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;快递单号:&nbsp;&nbsp;<input type='text' id="shipping_no" style='width: 200px;height: 30px;' ><br/><br/>
<input type='hidden' id='sure_order_id'> <input type='hidden' id='sure_order_sn'> <input type='hidden' id='sure_order_id'> <input type='hidden' id='sure_order_sn'>
&nbsp;&nbsp;&nbsp;&nbsp;<button class='layui-btn' onclick='SendStock()'>确定发货</button> &nbsp;&nbsp;&nbsp;&nbsp;<button class='layui-btn' onclick='SendStock()' style="margin-left: 130px;">确定发货</button>
</div> </div>
resources/views/Pcb/PcbPurchaseDetail.blade.php
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<th>焊盘喷镀</th> <th>焊盘喷镀</th>
<th>阻焊覆盖</th> <th>阻焊覆盖</th>
<th>内层铜厚</th> <th>内层铜厚</th>
<th>交货时间</th> <th>生产周期</th>
<th>交货日期</th> <th>交货日期</th>
<th></th> <th></th>
</tr> </tr>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
<td><?= $orderInfo['via_process'] ?></td> <td><?= $orderInfo['via_process'] ?></td>
<td><?= $orderInfo['copper_thickness'] ?></td> <td><?= $orderInfo['copper_thickness'] ?></td>
<td><?= @$orderInfo['finish_time'] ?></td> <td><?= @$orderInfo['finish_time'] ?></td>
<td><?= $purchase['shipping_time'] ?></td> <td><?= $purchase['finish_time'] ?></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
resources/views/Pcb/PcbPurchaseList.blade.php
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">下单时间:</label> <label class="layui-form-label">下单时间:</label>
<div class="layui-input-inline" style="width: 200px;"> <div class="layui-input-inline" style="width: 200px;">
<input type="text" name="start_time" id="start_time" value="{{date("Y-m-d 00:00:00",strtotime("-3 month"))}}" placeholder="开始时间" autocomplete="off" class="layui-input"> <input type="text" name="start_time" id="start_time" placeholder="开始时间" autocomplete="off" class="layui-input">
</div> </div>
<div class="layui-form-mid">-</div> <div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 200px;"> <div class="layui-input-inline" style="width: 200px;">
<input type="text" name="end_time" id="end_time" value="{{date("Y-m-d 23:59:59")}}" placeholder="结束时间" autocomplete="off" class="layui-input"> <input type="text" name="end_time" id="end_time" placeholder="结束时间" autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
</div> </div>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">订单状态:</label> <label class="layui-form-label">订单状态:</label>
<div class="layui-input-inline payment-status"> <div class="layui-input-inline payment-status" style="width: 800px !important;">
<input type="hidden" name="status" value=""> <input type="hidden" name="status" value="">
@if(!empty($status) && is_array($status)) @if(!empty($status) && is_array($status))
@foreach($status as $k=>$v) @foreach($status as $k=>$v)
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<table class="layui-table" lay-filter="test" id="list"></table> <table class="layui-table" lay-filter="test" id="list"></table>
<script type="text/html" id="cahe"> <script type="text/html" id="cahe">
<a href="/web/PcbPurchaseDetail?purchase_id=@{{ d.purchase_id }}&order_id=@{{ d.order_id }}" target="_blank" class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a> <a href="/web/PcbPurchaseDetail?purchase_id=@{{ d.purchase_id }}&order_id=@{{ d.order_id }}" class="btn btn-xs btn-outline btn-success"><strong>详情</strong></a>
@{{# if(d.status==3){ }} @{{# if(d.status==3){ }}
<button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.purchase_id }}" order_sn="@{{ d.purchase_sn }}" onclick="SurePurchase(@{{ d.purchase_id }})">采购确认</button> <button class="btn btn-xs btn-outline btn-danger" lay-submit="" order_id="@{{ d.purchase_id }}" order_sn="@{{ d.purchase_sn }}" onclick="SurePurchase(@{{ d.purchase_id }})">采购确认</button>
@{{# } }} @{{# } }}
......
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