Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CRM
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
华国豪
CRM
Commits
6f81cc36
Commit
6f81cc36
authored
May 17, 2022
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
a407a0ff
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
450 additions
and
7 deletions
+450
-7
customerOrder.vue
src/components/customerManage/customerOrder.vue
+13
-0
myCustomerOrder.vue
src/components/customerManage/myCustomerOrder.vue
+13
-0
orderList.vue
src/components/customerManage/orderList.vue
+25
-4
productDetails.vue
src/components/customerManage/productDetails.vue
+1
-1
Agreement.vue
src/components/guestManagement/Agreement.vue
+25
-0
ticketOrder.vue
src/components/guestManagement/ticketOrder.vue
+367
-2
index.vue
src/views/index.vue
+6
-0
No files found.
src/components/customerManage/customerOrder.vue
View file @
6f81cc36
...
...
@@ -300,6 +300,14 @@
this
.
MsgBus
.
$on
(
"closeGetList"
,
function
()
{
$this
.
getList
()
});
$this
.
MsgBus
.
$on
(
"closeBillMaking"
,
function
()
{
for
(
let
i
=
0
;
i
<
$this
.
dataList
.
length
;
i
++
)
{
$this
.
dataList
[
i
].
checkList
=
[];
$this
.
dataList
[
i
].
selectedType
=
""
;
$this
.
dataList
[
i
].
actuallyReceived
=
false
;
$this
.
dataList
[
i
].
cost
=
false
;
}
});
this
.
getList
()
},
methods
:
{
...
...
@@ -431,6 +439,11 @@
show
:
item
.
OrderStatus
!=
2
&&
item
.
OrderStatus
!=
5
&&
item
.
DueinMoney
==
0
?
true
:
false
},
{
Name
:
'订单收损'
,
Id
:
'8'
,
show
:
true
},
{
Name
:
"操作日志"
,
Id
:
"7"
,
show
:
true
,
...
...
src/components/customerManage/myCustomerOrder.vue
View file @
6f81cc36
...
...
@@ -281,6 +281,14 @@
this
.
MsgBus
.
$on
(
"closeGetList"
,
function
()
{
$this
.
getList
()
});
$this
.
MsgBus
.
$on
(
"closeBillMaking"
,
function
()
{
for
(
let
i
=
0
;
i
<
$this
.
dataList
.
length
;
i
++
)
{
$this
.
dataList
[
i
].
checkList
=
[];
$this
.
dataList
[
i
].
selectedType
=
""
;
$this
.
dataList
[
i
].
actuallyReceived
=
false
;
$this
.
dataList
[
i
].
cost
=
false
;
}
});
this
.
getList
()
},
methods
:
{
...
...
@@ -412,6 +420,11 @@
show
:
item
.
OrderStatus
!=
2
&&
item
.
OrderStatus
!=
5
&&
item
.
DueinMoney
==
0
?
true
:
false
},
{
Name
:
'订单收损'
,
Id
:
'8'
,
show
:
true
},
{
Name
:
"操作日志"
,
Id
:
"7"
,
show
:
true
,
...
...
src/components/customerManage/orderList.vue
View file @
6f81cc36
...
...
@@ -360,9 +360,6 @@ export default {
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
let
$this
=
this
;
$this
.
MsgBus
.
$on
(
"closeGetList"
,
function
()
{
$this
.
getList
()
});
$this
.
MsgBus
.
$on
(
"closeBillMaking"
,
function
()
{
for
(
let
i
=
0
;
i
<
$this
.
dataList
.
length
;
i
++
)
{
$this
.
dataList
[
i
].
checkList
=
[];
...
...
@@ -484,6 +481,30 @@ export default {
if
(
row
.
More
==
"7"
)
{
this
.
operationLog
(
row
);
}
// 操作日志
if
(
row
.
More
==
"8"
)
{
this
.
lossOperation
(
row
);
}
},
// 收损
lossOperation
(
row
){
if
(
this
.
superManage
)
{
this
.
lossOperationfun
(
row
)
}
else
{
if
(
this
.
userInfo
.
EmName
!=
row
.
EnterName
)
{
this
.
ValidateOperator
();
}
else
{
this
.
lossOperationfun
(
row
)
}
}
},
lossOperationfun
(
row
){
this
.
MsgBus
.
$emit
(
"lossOrderBoxOpen"
,
row
.
GuestId
,
row
,
true
);
},
// 订单完结
orderCompleted
(
row
){
...
...
@@ -510,7 +531,7 @@ export default {
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
$message
.
success
(
res
.
data
.
message
);
this
.
getList
()
this
.
MsgBus
.
$emit
(
"closeGetList"
);
}
else
{
this
.
$message
.
warning
(
res
.
data
.
message
);
}
...
...
src/components/customerManage/productDetails.vue
View file @
6f81cc36
<
style
>
<
style
scoped
>
.orderProductDetails-box
{
padding
:
20px
0
;
background-color
:
#fff
;
...
...
src/components/guestManagement/Agreement.vue
View file @
6f81cc36
...
...
@@ -613,6 +613,26 @@
if
(
row
.
More
==
"7"
)
{
this
.
operationLog
(
row
);
}
// 操作日志
if
(
row
.
More
==
"8"
)
{
this
.
lossOperationfun
(
row
);
}
},
// 收损
lossOperation
(
row
){
if
(
this
.
userInfo
.
EmName
!=
row
.
EnterName
)
{
this
.
ValidateOperator
();
}
else
{
this
.
lossOperationfun
(
row
)
}
},
lossOperationfun
(
row
){
this
.
MsgBus
.
$emit
(
"lossOrderBoxOpen"
,
row
.
GuestId
,
row
,
true
);
},
// 订单完结
orderCompleted
(
row
){
...
...
@@ -1034,6 +1054,11 @@
show
:
item
.
OrderStatus
!=
2
&&
item
.
OrderStatus
!=
5
&&
item
.
DueinMoney
==
0
?
true
:
false
},
{
Name
:
'订单收损'
,
Id
:
'8'
,
show
:
true
},
{
Name
:
"操作日志"
,
Id
:
"7"
,
show
:
true
,
...
...
src/components/guestManagement/ticketOrder.vue
View file @
6f81cc36
This diff is collapsed.
Click to expand it.
src/views/index.vue
View file @
6f81cc36
...
...
@@ -327,6 +327,12 @@
$this
.
obj
=
obj
;
$this
.
dialogTicketOrderVisible
=
true
;
});
this
.
MsgBus
.
$on
(
"lossOrderBoxOpen"
,
function
(
GuestId
,
obj
)
{
$this
.
dialogTicketOrderVisibleName
=
"订单收损"
;
$this
.
GuestId
=
GuestId
;
$this
.
obj
=
obj
;
$this
.
dialogTicketOrderVisible
=
true
;
});
this
.
MsgBus
.
$on
(
"reviseTicketOrderBoxOpen"
,
function
(
GuestId
,
obj
)
{
$this
.
dialogTicketOrderVisibleName
=
"修改出票状态"
;
$this
.
GuestId
=
GuestId
;
...
...
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