Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0a66d671
authored
Dec 25, 2018
by
PRY5YKGJ82EZEPX\Administrator
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
更新pcb后台
parent
1a720583
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
83 additions
and
101 deletions
.idea/workspace.xml
app/Http/Controllers/WebController.php
public/js/PcbPurchaseList.js
resources/views/Pcb/PcbOrderDetail.blade.php
resources/views/Pcb/PcbPurchaseList.blade.php
.idea/workspace.xml
View file @
0a66d671
...
@@ -5,15 +5,10 @@
...
@@ -5,15 +5,10 @@
</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/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/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$/public/js/PcbPurchaseList.js"
afterPath=
"$PROJECT_DIR$/public/js/PcbPurchaseList.js"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/config/database.php"
afterPath=
"$PROJECT_DIR$/config/database.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$/config/params.php"
afterPath=
"$PROJECT_DIR$/config/params.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$/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"
/>
</list>
</list>
<ignored
path=
"Order.iws"
/>
<ignored
path=
"Order.iws"
/>
<ignored
path=
".idea/workspace.xml"
/>
<ignored
path=
".idea/workspace.xml"
/>
...
@@ -33,8 +28,6 @@
...
@@ -33,8 +28,6 @@
<favorites_list
name=
"Order"
/>
<favorites_list
name=
"Order"
/>
</component>
</component>
<component
name=
"FileEditorManager"
>
<component
name=
"FileEditorManager"
>
<splitter
split-orientation=
"horizontal"
split-proportion=
"0.5"
>
<split-first>
<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=
"ApiController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"
>
<entry
file=
"file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php"
>
...
@@ -58,11 +51,11 @@
...
@@ -58,11 +51,11 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"WebController.php"
pinned=
"false"
current-in-tab=
"tru
e"
>
<file
leaf-file-name=
"WebController.php"
pinned=
"false"
current-in-tab=
"fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/app/Http/Controllers/WebController.php"
>
<entry
file=
"file://$PROJECT_DIR$/app/Http/Controllers/WebController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"4
03"
>
<state
relative-caret-position=
"3
03"
>
<caret
line=
"177"
column=
"73"
selection-start-line=
"177"
selection-start-column=
"73"
selection-end-line=
"177"
selection-end-column=
"73
"
/>
<caret
line=
"104"
column=
"62"
selection-start-line=
"104"
selection-start-column=
"62"
selection-end-line=
"104"
selection-end-column=
"62
"
/>
<folding>
<folding>
<element
signature=
"e#40#71#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#40#71#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#323#1210#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#323#1210#0#PHP"
expanded=
"false"
/>
...
@@ -91,69 +84,60 @@
...
@@ -91,69 +84,60 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"PcbPurchaseList.js
"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"PcbPurchaseList.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/PcbPurchaseList.blade.php
"
>
<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=
"583
"
>
<caret
line=
"49"
column=
"27"
selection-start-line=
"49"
selection-start-column=
"22"
selection-end-line=
"49"
selection-end-column=
"27
"
/>
<caret
line=
"90"
column=
"23"
selection-start-line=
"90"
selection-start-column=
"23"
selection-end-line=
"90"
selection-end-column=
"23
"
/>
<folding
/>
<folding
/>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"PcbPurchaseModel.php"
pinned=
"false"
current-in-tab=
"fals
e"
>
<file
leaf-file-name=
"PcbPurchaseList.js"
pinned=
"false"
current-in-tab=
"tru
e"
>
<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=
"442
"
>
<caret
line=
"73"
column=
"35"
selection-start-line=
"73"
selection-start-column=
"35"
selection-end-line=
"7
3"
selection-end-column=
"35"
/>
<caret
line=
"123"
column=
"35"
selection-start-line=
"123"
selection-start-column=
"35"
selection-end-line=
"12
3"
selection-end-column=
"35"
/>
<folding
/>
<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=
"common.min.js
"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.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=
"708
"
>
<state
relative-caret-position=
"500
"
>
<caret
line=
"89"
column=
"69"
selection-start-line=
"89"
selection-start-column=
"69"
selection-end-line=
"89"
selection-end-column=
"69
"
/>
<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>
</file>
</file>
<file
leaf-file-name=
"PcbOrderDetail.blade
.php"
pinned=
"false"
current-in-tab=
"false"
>
<file
leaf-file-name=
"PcbPurchaseModel
.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade
.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=
"489"
>
<state
relative-caret-position=
"325"
>
<caret
line=
"193"
column=
"37"
selection-start-line=
"193"
selection-start-column=
"37"
selection-end-line=
"193"
selection-end-column=
"37"
/>
<caret
line=
"73"
column=
"35"
selection-start-line=
"73"
selection-start-column=
"35"
selection-end-line=
"73"
selection-end-column=
"35"
/>
<folding>
<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>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
</leaf>
<file
leaf-file-name=
"PcbOrderDetail.blade.php"
pinned=
"false"
current-in-tab=
"false"
>
</split-first>
<entry
file=
"file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php"
>
<split-second>
<leaf>
<file
leaf-file-name=
"params.php"
pinned=
"false"
current-in-tab=
"true"
>
<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=
"300"
>
<state
relative-caret-position=
"575"
>
<caret
line=
"12"
column=
"27"
selection-start-line=
"12"
selection-start-column=
"15"
selection-end-line=
"12"
selection-end-column=
"27"
/>
<caret
line=
"86"
column=
"28"
selection-start-line=
"86"
selection-start-column=
"28"
selection-end-line=
"86"
selection-end-column=
"28"
/>
<folding
/>
<folding>
<marker
date=
"1545699706429"
expanded=
"true"
signature=
"1533:1578"
ph=
"..."
/>
<marker
date=
"1545699706429"
expanded=
"true"
signature=
"2256:2300"
ph=
"..."
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
</file>
</file>
</leaf>
</leaf>
</split-second>
</splitter>
</component>
</component>
<component
name=
"FileTemplateManagerImpl"
>
<component
name=
"FileTemplateManagerImpl"
>
<option
name=
"RECENT_TEMPLATES"
>
<option
name=
"RECENT_TEMPLATES"
>
...
@@ -206,12 +190,12 @@
...
@@ -206,12 +190,12 @@
<option
value=
"$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php"
/>
<option
value=
"$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php"
/>
<option
value=
"$PROJECT_DIR$/app/Http/Controllers/ApiController.php"
/>
<option
value=
"$PROJECT_DIR$/app/Http/Controllers/ApiController.php"
/>
<option
value=
"$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php"
/>
<option
value=
"$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php"
/>
<option
value=
"$PROJECT_DIR$/public/js/PcbPurchaseList.js"
/>
<option
value=
"$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php"
/>
<option
value=
"$PROJECT_DIR$/config/params.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/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$/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>
...
@@ -354,15 +338,15 @@
...
@@ -354,15 +338,15 @@
<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=
"6
50
37000"
/>
<workItem
from=
"1545360991555"
duration=
"6
65
37000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"10
70
44000"
/>
<option
name=
"totallyTimeSpent"
value=
"10
85
44000"
/>
</component>
</component>
<component
name=
"ToolWindowManager"
>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"
6
"
/>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"
7
"
/>
<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"
/>
...
@@ -668,14 +652,6 @@
...
@@ -668,14 +652,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</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"
>
<entry
file=
"file://$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"875"
>
<state
relative-caret-position=
"875"
>
...
@@ -762,20 +738,6 @@
...
@@ -762,20 +738,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</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"
>
<entry
file=
"file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"509"
>
<state
relative-caret-position=
"509"
>
...
@@ -840,14 +802,6 @@
...
@@ -840,14 +802,6 @@
</state>
</state>
</provider>
</provider>
</entry>
</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"
>
<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=
"425"
>
<state
relative-caret-position=
"425"
>
...
@@ -856,14 +810,6 @@
...
@@ -856,14 +810,6 @@
</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=
"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"
>
<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=
"50"
>
<state
relative-caret-position=
"50"
>
...
@@ -880,10 +826,21 @@
...
@@ -880,10 +826,21 @@
</state>
</state>
</provider>
</provider>
</entry>
</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"
>
<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=
"
4
03"
>
<state
relative-caret-position=
"
3
03"
>
<caret
line=
"1
77"
column=
"73"
selection-start-line=
"177"
selection-start-column=
"73"
selection-end-line=
"177"
selection-end-column=
"73
"
/>
<caret
line=
"1
04"
column=
"62"
selection-start-line=
"104"
selection-start-column=
"62"
selection-end-line=
"104"
selection-end-column=
"62
"
/>
<folding>
<folding>
<element
signature=
"e#40#71#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#40#71#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#323#1210#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#323#1210#0#PHP"
expanded=
"false"
/>
...
@@ -891,5 +848,29 @@
...
@@ -891,5 +848,29 @@
</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=
"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>
</component>
</project>
</project>
\ No newline at end of file
app/Http/Controllers/WebController.php
View file @
0a66d671
...
@@ -102,10 +102,7 @@ class WebController extends Controller
...
@@ -102,10 +102,7 @@ class WebController extends Controller
//订单发票信息
//订单发票信息
$orderInvoice
=
$con
->
table
(
'order_invoice'
)
->
where
([
'order_id'
=>
$order_id
])
->
first
();
$orderInvoice
=
$con
->
table
(
'order_invoice'
)
->
where
([
'order_id'
=>
$order_id
])
->
first
();
//物流信息
//物流信息
$shipping
=
$con
->
table
(
'shipping'
)
->
where
([
'order_id'
=>
$order_id
,
'shipping_type'
=>
1
])
->
first
();
$shipping
=
$con
->
table
(
'shipping'
)
->
where
([
'relevance_id'
=>
$order_id
,
'shipping_type'
=>
1
])
->
first
();
if
(
$shipping
){
$shipping
=
objectToArray
(
$shipping
);
}
//查询操作日志
//查询操作日志
$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
();
...
@@ -155,7 +152,7 @@ class WebController extends Controller
...
@@ -155,7 +152,7 @@ class WebController extends Controller
$data
[
'orderAuditReason2'
]
=
objectToArray
(
$orderAuditReason2
);
$data
[
'orderAuditReason2'
]
=
objectToArray
(
$orderAuditReason2
);
$data
[
'orderInfo'
]
=
objectToArray
(
$orderInfo
);
$data
[
'orderInfo'
]
=
objectToArray
(
$orderInfo
);
$data
[
'orderInvoice'
]
=
$orderInvoice
;
$data
[
'orderInvoice'
]
=
$orderInvoice
;
$data
[
'shipping'
]
=
$shipping
;
$data
[
'shipping'
]
=
objectToArray
(
$shipping
)
;
$data
[
'actionLog'
]
=
objectToArray
(
$actionLog
);
$data
[
'actionLog'
]
=
objectToArray
(
$actionLog
);
return
view
(
"Pcb"
,
$data
);
return
view
(
"Pcb"
,
$data
);
...
...
public/js/PcbPurchaseList.js
View file @
0a66d671
...
@@ -121,6 +121,7 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
...
@@ -121,6 +121,7 @@ layui.use(['table','form','element','layer', 'laydate'], function() {
})
})
//确定发货
//确定发货
function
SurePurchase
(
purchase_id
)
{
function
SurePurchase
(
purchase_id
)
{
alert_confirm
(
"采购已完成,请确认是否通过审核?"
,
function
()
{
$
.
ajax
({
$
.
ajax
({
url
:
'/api/ApiConfirmOrder'
,
url
:
'/api/ApiConfirmOrder'
,
type
:
'post'
,
type
:
'post'
,
...
@@ -138,4 +139,6 @@ function SurePurchase(purchase_id) {
...
@@ -138,4 +139,6 @@ function SurePurchase(purchase_id) {
}
}
}
}
})
})
})
}
}
resources/views/Pcb/PcbOrderDetail.blade.php
View file @
0a66d671
...
@@ -81,8 +81,8 @@
...
@@ -81,8 +81,8 @@
<td>
<?=
$orderAddress
[
'consignee'
]
?>
</td>
<td>
<?=
$orderAddress
[
'consignee'
]
?>
</td>
<td>
<?=
$orderAddress
[
'mobile'
]
?>
</td>
<td>
<?=
$orderAddress
[
'mobile'
]
?>
</td>
<td>
<?=
$orderAddress
[
"province"
]
.
$orderAddress
[
"city"
]
.
$orderAddress
[
"district"
]
.
$orderAddress
[
'detail_address'
]
?>
</td>
<td>
<?=
$orderAddress
[
"province"
]
.
$orderAddress
[
"city"
]
.
$orderAddress
[
"district"
]
.
$orderAddress
[
'detail_address'
]
?>
</td>
<td>
<?=
@
$
orderS
hipping
[
'shipping_name'
]
?>
</td>
<td>
<?=
@
$
s
hipping
[
'shipping_name'
]
?>
</td>
<td>
<?=
@
$
orderS
hipping
[
'shipping_no'
]
?>
</td>
<td>
<?=
@
$
s
hipping
[
'shipping_no'
]
?>
</td>
</tr>
</tr>
</tbody>
</tbody>
</table>
</table>
...
...
resources/views/Pcb/PcbPurchaseList.blade.php
View file @
0a66d671
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
<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 }}"
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
>
<
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>
</script>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment