Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
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
黄媛媛
ElectricitySheep
Commits
f1688136
Commit
f1688136
authored
Aug 20, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单列表的制单
parent
10326cf7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
38 deletions
+65
-38
orderList.vue
src/components/orderMan/orderList.vue
+37
-37
addCoupon.vue
src/components/sallCenter/addCoupon.vue
+28
-1
No files found.
src/components/orderMan/orderList.vue
View file @
f1688136
...
...
@@ -180,45 +180,45 @@
</div>
<!--
<div
flex=
"cross:center main:center"
>
--
>
<!--
<el-dropdown
trigger=
"click"
>
--
>
<!--
<span
class=
"el-dropdown-link"
>
制单
</span>
--
>
<!--
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
--
>
<!--
<el-dropdown-item
@
click
.
native=
"goCollection(item,list)"
>
--
>
<!-- 收入制单-->
<!--
</el-dropdown-item>
--
>
<!--
<el-dropdown-item
@
click
.
native=
"goPayment(item,list)"
>
--
>
<!-- 付款制单-->
<!--
</el-dropdown-item>
--
>
<!--
</el-dropdown-menu>
--
>
<!--
</el-dropdown>
--
>
<!--
</div>
--
>
<div
flex=
"cross:center main:center"
>
<el-dropdown
trigger=
"click"
>
<span
class=
"el-dropdown-link"
>
制单
</span
>
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"goCollection(item,list)"
>
收入制单
</el-dropdown-item
>
<el-dropdown-item
@
click
.
native=
"goPayment(item,list)"
>
付款制单
</el-dropdown-item
>
</el-dropdown-menu
>
</el-dropdown
>
</div
>
</div>
</div>
<!--
<div
class=
"billStyle"
v-if=
"list.SFinanceList.length>0|| list.ZFinanceList.length >0"
>
--
>
<!--
<div
class=
"billStyle_item"
style=
"border-right: 1px solid #EBEEF5"
>
--
>
<!-- 收入单据:-->
<!--
<span
v-for=
"(item,index2) in list.SFinanceList"
:key=
"index2"
@
click=
"goSF(item)"
>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 1"
:style=
"
{color:'#0080FF'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 2&&item.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"
{color:'#800080'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
</span>
--
>
<!--
</div>
--
>
<!--
<div
class=
"billStyle_item"
>
--
>
<!-- 支出单据:-->
<!--
<span
v-for=
"(item,index2) in list.ZFinanceList"
:key=
"index2"
@
click=
"goZF(item)"
>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 1"
:style=
"
{color:'#0080FF'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 2&&item.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"
{color:'#800080'}">
{{
item
.
FrID
}}
</span>
--
>
<!--
</span>
--
>
<!--
</div>
--
>
<!--
</div>
--
>
<div
class=
"billStyle"
v-if=
"list.SFinanceList.length>0|| list.ZFinanceList.length >0"
>
<div
class=
"billStyle_item"
style=
"border-right: 1px solid #EBEEF5"
>
收入单据:
<span
v-for=
"(item,index2) in list.SFinanceList"
:key=
"index2"
@
click=
"goSF(item)"
>
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 1"
:style=
"
{color:'#0080FF'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 2&&item.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"
{color:'#800080'}">
{{
item
.
FrID
}}
</span
>
</span
>
</div
>
<div
class=
"billStyle_item"
>
支出单据:
<span
v-for=
"(item,index2) in list.ZFinanceList"
:key=
"index2"
@
click=
"goZF(item)"
>
<span
class=
"billtext"
v-if=
"item.Status == 0"
:style=
"
{color:'#00FFFF'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 1"
:style=
"
{color:'#0080FF'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 2&&item.Is_Cashier==1"
:style=
"
{color:'#FF4048'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 3"
:style=
"
{color:'#FFF100'}">
{{
item
.
FrID
}}
</span
>
<span
class=
"billtext"
v-if=
"item.Status == 4"
:style=
"
{color:'#800080'}">
{{
item
.
FrID
}}
</span
>
</span
>
</div
>
</div
>
</div>
</div>
<div
flex=
"cross:center"
class=
"app-order-info"
style=
"width: 15%;"
>
...
...
src/components/sallCenter/addCoupon.vue
View file @
f1688136
...
...
@@ -16,6 +16,14 @@
<el-form-item
label=
"卡券名称"
prop=
"Name"
class=
"is-required"
>
<el-input
v-model=
"msg.Name"
/>
</el-form-item>
<el-form-item
label=
"微店铺"
>
<el-select
size=
"small"
v-model=
"msg.SmallShopId"
:filter-method=
"ChangeListName"
filterable
placeholder=
"请选择"
>
<el-option
label=
"不限"
:value=
"0"
></el-option>
<el-option
v-for=
"item in SmallShopData"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"优惠券类型"
class=
"is-required"
>
<el-radio-group
v-model=
"msg.CouponType"
@
change=
"msg.DiscountsPrice = 0"
>
<el-radio
:label=
"1"
>
满减券
</el-radio>
...
...
@@ -302,6 +310,7 @@
StartDate
:
''
,
EndDate
:
''
,
value
:[],
SmallShopId
:
0
,
//微店id
},
checkedkeys
:[],
//默认选中的
huiyuan
:
false
,
...
...
@@ -311,6 +320,7 @@
activeName
:
'first'
,
commodity
:
false
,
addcommodity
:
false
,
SmallShopData
:[],
rules
:{
Name
:[
{
required
:
true
,
message
:
"优惠券名称不能为空"
,
trigger
:
"blur"
}
...
...
@@ -364,11 +374,14 @@
count
:
0
,
multipleSelection
:[],
AppointList2
:[],
SmallShopMsg
:{
Name
:
''
,
}
}
},
created
(){
this
.
getMemberGradeList
()
this
.
getSmallShopsDropDownList
()
},
...
...
@@ -675,7 +688,21 @@
}
this
.
AppointList
=
ProductList
},
ChangeListName
(
val
)
{
this
.
SmallShopMsg
.
Name
=
val
;
this
.
getSmallShopsDropDownList
()
},
getSmallShopsDropDownList
(){
this
.
apipost
(
"/api/SmallShops/GetAllSmallShopsList"
,
this
.
SmallShopMsg
,
res
=>
{
this
.
loading
=
false
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
SmallShopData
=
res
.
data
.
data
}
else
{
this
.
Info
(
res
.
data
.
message
);
}
})
}
},
mounted
(){
...
...
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