Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 0a66d671 by PRY5YKGJ82EZEPX\Administrator
Options

更新pcb后台

parent 1a720583
Inline Side-by-side
Showing with 83 additions and 101 deletions
.idea/workspace.xml
......@@ -5,15 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Http/Controllers/RegionController.php" afterPath="$PROJECT_DIR$/app/Http/Controllers/RegionController.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$/config/database.php" afterPath="$PROJECT_DIR$/config/database.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/params.php" afterPath="$PROJECT_DIR$/config/params.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/website.php" afterPath="$PROJECT_DIR$/config/website.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/common.min.js" afterPath="$PROJECT_DIR$/public/js/common.min.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/PcbPurchaseList.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" />
</list>
<ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" />
......@@ -33,8 +28,6 @@
<favorites_list name="Order" />
</component>
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.5">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
......@@ -58,11 +51,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="WebController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="WebController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="177" column="73" selection-start-line="177" selection-start-column="73" selection-end-line="177" selection-end-column="73" />
<state relative-caret-position="303">
<caret line="104" column="62" selection-start-line="104" selection-start-column="62" selection-end-line="104" selection-end-column="62" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
<element signature="e#323#1210#0#PHP" expanded="false" />
......@@ -91,69 +84,60 @@
</provider>
</entry>
</file>
<file leaf-file-name="PcbPurchaseList.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js">
<file leaf-file-name="PcbPurchaseList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-425">
<caret line="49" column="27" selection-start-line="49" selection-start-column="22" selection-end-line="49" selection-end-column="27" />
<state relative-caret-position="583">
<caret line="90" column="23" selection-start-line="90" selection-start-column="23" selection-end-line="90" selection-end-column="23" />
<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">
<file leaf-file-name="PcbPurchaseList.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="73" column="35" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
<state relative-caret-position="442">
<caret line="123" column="35" selection-start-line="123" selection-start-column="35" selection-end-line="123" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PcbPurchaseList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<file leaf-file-name="common.min.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/js/common.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="708">
<caret line="89" column="69" selection-start-line="89" selection-start-column="69" selection-end-line="89" selection-end-column="69" />
<state relative-caret-position="500">
<caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" />
<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">
<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">
<state relative-caret-position="489">
<caret line="193" column="37" selection-start-line="193" selection-start-column="37" selection-end-line="193" selection-end-column="37" />
<folding>
<element signature="n#style#0;n#input#0;n#th#1;n#tr#9;n#tbody#0;n#table#0;n#td#0;n#tr#1;n#tbody#0;n#table#4;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#10691#10697#0#HTML" expanded="true" />
<element signature="e#10697#10703#0#HTML" expanded="true" />
<marker date="1545643487301" expanded="true" signature="1533:1578" ph="..." />
<marker date="1545643487301" expanded="true" signature="2256:2300" ph="..." />
</folding>
<state relative-caret-position="325">
<caret line="73" column="35" selection-start-line="73" selection-start-column="35" selection-end-line="73" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</split-first>
<split-second>
<leaf>
<file leaf-file-name="params.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/params.php">
<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">
<state relative-caret-position="300">
<caret line="12" column="27" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="27" />
<folding />
<state relative-caret-position="575">
<caret line="86" column="28" selection-start-line="86" selection-start-column="28" selection-end-line="86" selection-end-column="28" />
<folding>
<marker date="1545699706429" expanded="true" signature="1533:1578" ph="..." />
<marker date="1545699706429" expanded="true" signature="2256:2300" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</split-second>
</splitter>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -206,12 +190,12 @@
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php" />
<option value="$PROJECT_DIR$/public/js/PcbPurchaseList.js" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php" />
<option value="$PROJECT_DIR$/config/params.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.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>
</option>
</component>
......@@ -354,15 +338,15 @@
<workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="2229000" />
<workItem from="1545360823838" duration="125000" />
<workItem from="1545360991555" duration="65037000" />
<workItem from="1545360991555" duration="66537000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="107044000" />
<option name="totallyTimeSpent" value="108544000" />
</component>
<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="7" />
<editor active="true" />
<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" />
......@@ -668,14 +652,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/common.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="152" column="23" selection-start-line="152" selection-start-column="23" selection-end-line="152" selection-end-column="23" />
<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">
......@@ -762,20 +738,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="489">
<caret line="193" column="37" selection-start-line="193" selection-start-column="37" selection-end-line="193" selection-end-column="37" />
<folding>
<element signature="n#style#0;n#input#0;n#th#1;n#tr#9;n#tbody#0;n#table#0;n#td#0;n#tr#1;n#tbody#0;n#table#4;n#div#0;n#div#0;n#div#0;n#div#0;n#!!top" expanded="true" />
<element signature="e#10691#10697#0#HTML" expanded="true" />
<element signature="e#10697#10703#0#HTML" expanded="true" />
<marker date="1545643487301" expanded="true" signature="1533:1578" ph="..." />
<marker date="1545643487301" expanded="true" signature="2256:2300" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
......@@ -840,14 +802,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-425">
<caret line="49" column="27" selection-start-line="49" selection-start-column="22" selection-end-line="49" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
......@@ -856,14 +810,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="708">
<caret line="89" column="69" selection-start-line="89" selection-start-column="69" selection-end-line="89" selection-end-column="69" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/params.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
......@@ -880,10 +826,21 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="86" column="28" selection-start-line="86" selection-start-column="28" selection-end-line="86" selection-end-column="28" />
<folding>
<marker date="1545699706429" expanded="true" signature="1533:1578" ph="..." />
<marker date="1545699706429" expanded="true" signature="2256:2300" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="403">
<caret line="177" column="73" selection-start-line="177" selection-start-column="73" selection-end-line="177" selection-end-column="73" />
<state relative-caret-position="303">
<caret line="104" column="62" selection-start-line="104" selection-start-column="62" selection-end-line="104" selection-end-column="62" />
<folding>
<element signature="e#40#71#0#PHP" expanded="true" />
<element signature="e#323#1210#0#PHP" expanded="false" />
......@@ -891,5 +848,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="583">
<caret line="90" column="23" selection-start-line="90" selection-start-column="23" selection-end-line="90" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/common.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="123" column="35" selection-start-line="123" selection-start-column="35" selection-end-line="123" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/Http/Controllers/WebController.php
......@@ -102,10 +102,7 @@ class WebController extends Controller
//订单发票信息
$orderInvoice = $con->table('order_invoice')->where(['order_id' => $order_id])->first();
//物流信息
$shipping = $con->table('shipping')->where(['order_id' => $order_id,'shipping_type'=>1])->first();
if ($shipping){
$shipping = objectToArray($shipping);
}
$shipping = $con->table('shipping')->where(['relevance_id' => $order_id,'shipping_type'=>1])->first();
//查询操作日志
$actionLog = $con->table("action_log")->where(["type"=>1,'oid'=>$order_id])->orderBy("id","desc")->get();
......@@ -155,7 +152,7 @@ class WebController extends Controller
$data['orderAuditReason2'] = objectToArray($orderAuditReason2);
$data['orderInfo'] = objectToArray($orderInfo);
$data['orderInvoice'] = $orderInvoice;
$data['shipping'] = $shipping;
$data['shipping'] = objectToArray($shipping);
$data['actionLog'] = objectToArray($actionLog);
return view("Pcb",$data);
......
public/js/PcbPurchaseList.js
......@@ -121,6 +121,7 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
})
//确定发货
function SurePurchase(purchase_id) {
alert_confirm("采购已完成，请确认是否通过审核?",function () {
$.ajax({
url:'/api/ApiConfirmOrder',
type:'post',
......@@ -138,4 +139,6 @@ function SurePurchase(purchase_id) {
}
}
})
})
}
resources/views/Pcb/PcbOrderDetail.blade.php
......@@ -81,8 +81,8 @@
<td><?= $orderAddress['consignee'] ?></td>
<td><?= $orderAddress['mobile'] ?></td>
<td><?= $orderAddress["province"].$orderAddress["city"].$orderAddress["district"].$orderAddress['detail_address'] ?></td>
<td><?= @$orderShipping['shipping_name'] ?></td>
<td><?= @$orderShipping['shipping_no'] ?></td>
<td><?= @$shipping['shipping_name'] ?></td>
<td><?= @$shipping['shipping_no'] ?></td>
</tr>
</tbody>
</table>
......
resources/views/Pcb/PcbPurchaseList.blade.php
......@@ -88,7 +88,7 @@
<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>
@{{# if(d.status==1){ }}
@{{# 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>
@{{# } }}
</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