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
92ebb08b
Commit
92ebb08b
authored
Sep 02, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
c90ecf23
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
167 additions
and
266 deletions
+167
-266
goodsListEdit.vue
src/components/CommodityMan/goodsListEdit.vue
+2
-10
addSite.vue
src/components/director/addSite.vue
+91
-7
directorGoodsList.vue
src/components/director/directorGoodsList.vue
+11
-230
guideCarSiteList.vue
src/components/director/guideCarSiteList.vue
+48
-9
customerEvaluation.vue
src/components/orderMan/customerEvaluation.vue
+15
-10
No files found.
src/components/CommodityMan/goodsListEdit.vue
View file @
92ebb08b
...
@@ -2150,18 +2150,10 @@
...
@@ -2150,18 +2150,10 @@
if
(
this
.
addMsg
.
MarketingLogo
)
{
if
(
this
.
addMsg
.
MarketingLogo
)
{
try
{
try
{
let
MarketingLogo
=
JSON
.
parse
(
this
.
addMsg
.
MarketingLogo
)
let
MarketingLogo
=
JSON
.
parse
(
this
.
addMsg
.
MarketingLogo
)
if
(
MarketingLogo
.
indexOf
(
'iswords'
)
==-
1
){
this
.
addMsg
.
MarketingLogo
=
{
iswords
:
0
,
words
:
""
,
wordsColor
:
""
,
wordsBack
:
""
,
ico
:
""
}
}
else
{
let
obj
=
MarketingLogo
let
obj
=
MarketingLogo
this
.
addMsg
.
MarketingLogo
=
obj
this
.
addMsg
.
MarketingLogo
=
obj
}
}
catch
(
err
)
{
}
catch
(
err
)
{
this
.
addMsg
.
MarketingLogo
=
{
this
.
addMsg
.
MarketingLogo
=
{
iswords
:
0
,
iswords
:
0
,
...
...
src/components/director/addSite.vue
View file @
92ebb08b
...
@@ -15,16 +15,45 @@
...
@@ -15,16 +15,45 @@
<el-radio
v-model=
"addMsg.IsEnable"
:label=
"1"
>
是
</el-radio>
<el-radio
v-model=
"addMsg.IsEnable"
:label=
"1"
>
是
</el-radio>
<el-radio
v-model=
"addMsg.IsEnable"
:label=
"0"
>
否
</el-radio>
<el-radio
v-model=
"addMsg.IsEnable"
:label=
"0"
>
否
</el-radio>
</el-form-item>
</el-form-item>
<el-form-item
label=
"司导区域"
class=
"is-required"
>
<div
class=
"gez_list el-card"
v-if=
"addMsg.RegionList.length>0"
>
<div
style=
"width: 500px;"
>
<div
>
区域:
<span
v-for=
"(item,index) in addMsg.RegionList"
:key=
"index"
class=
"quyu"
>
{{
item
.
RegionName
}}
</span>
</div>
</div>
<div
style=
"width: 110px;display: flex;flex-direction: row;justify-content: space-around"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"编辑"
placement=
"top"
>
<img
src=
"../../assets/img/setup/edit.png"
alt=
""
class=
"imgstyle"
@
click=
"edit()"
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top"
>
<img
src=
"../../assets/img/setup/del.png"
alt=
""
class=
"imgstyle"
@
click=
"delete_b()"
>
</el-tooltip>
</div>
</div>
<span
style=
"color: #409EFF;font-size: 14px;cursor: pointer;"
@
click=
"addOf"
v-if=
"addMsg.RegionList.length==0"
>
+新增规则
</span>
</el-form-item>
</el-form>
</el-form>
</div>
</div>
<div
style=
"margin-top:20px"
>
<div
style=
"margin-top:20px"
>
<el-button
size=
"small"
type=
"primary"
@
click=
"Save('addMsg')"
>
保存
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"Save('addMsg')"
>
保存
</el-button>
</div>
</div>
<el-dialog
title=
"新增司导地区"
:visible
.
sync=
"dialogFormVisible"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
>
<el-form-item
label=
"司导地区"
prop=
"List"
>
<region
_Choice
@
event1=
"change($event)"
ref=
"child"
></region
_Choice
>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"dialogFormVisible = false"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"Addto()"
>
确 定
</el-button>
</div>
</el-dialog>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
region_Choice
from
'../setup/view/regionChoice'
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
...
@@ -44,6 +73,8 @@
...
@@ -44,6 +73,8 @@
},
},
loading
:
false
,
loading
:
false
,
dialogFormVisible
:
false
,
};
};
},
},
...
@@ -53,6 +84,9 @@
...
@@ -53,6 +84,9 @@
this
.
getData
(
this
.
$route
.
query
.
ID
)
this
.
getData
(
this
.
$route
.
query
.
ID
)
}
}
},
},
components
:{
region_Choice
,
},
methods
:
{
methods
:
{
...
@@ -60,9 +94,9 @@
...
@@ -60,9 +94,9 @@
Save
(
formName
)
{
Save
(
formName
)
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
this
.
apipost
(
"/api/
MallBase/AddOrUpdateFreeShipping
"
,
this
.
addMsg
,
res
=>
{
this
.
apipost
(
"/api/
GuideCar/AddOrUpdateGuideCarSite
"
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
CommonJump
(
'
mailRules
'
);
this
.
CommonJump
(
'
guideCarSiteList
'
);
this
.
Success
(
res
.
data
.
message
);
this
.
Success
(
res
.
data
.
message
);
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -73,18 +107,41 @@
...
@@ -73,18 +107,41 @@
}
}
});
});
},
},
edit
(){
this
.
dialogFormVisible
=
true
;
setTimeout
(()
=>
{
this
.
$refs
.
child
.
Receive
(
this
.
addMsg
.
RegionList
)
},
1000
)
}
,
delete_b
(){
this
.
addMsg
.
RegionList
=
[]
},
change
(
data
){
this
.
List
=
data
;
},
Addto
(){
this
.
dialogFormVisible
=
false
this
.
addMsg
.
RegionList
=
this
.
List
;
},
addOf
(){
this
.
List
=
[]
this
.
dialogFormVisible
=
true
;
this
.
isedit
=
false
;
//设置为编辑状态
setTimeout
(()
=>
{
this
.
$refs
.
child
.
Receive
(
this
.
List
)
},
1000
)
},
getData
(
ID
)
{
getData
(
ID
)
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
"/api/
MallBase/GetFreeShipping
Model"
,
{
this
.
apipost
(
"/api/
GuideCar/GetGuideCarSite
Model"
,
{
I
d
:
ID
I
D
:
ID
},
res
=>
{
},
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
this
.
addMsg
=
res
.
data
.
data
;
this
.
addMsg
=
res
.
data
.
data
;
})
})
},
},
},
},
...
@@ -186,5 +243,32 @@
...
@@ -186,5 +243,32 @@
padding
:
20px
;
padding
:
20px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
.addSite
.gez_list
{
width
:
650px
;
margin-bottom
:
12px
;
padding
:
20px
;
border
:
1px
solid
#EBEEF5
;
background-color
:
#FFF
;
color
:
#303133
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
space-between
;
}
.addSite
.quyu
{
background-color
:
#f4f4f5
;
color
:
#909399
;
padding
:
10px
;
line-height
:
30px
;
height
:
30px
;
font-size
:
12px
;
border-radius
:
4px
;
white-space
:
nowrap
;
margin
:
5px
;
}
.addSite
.imgstyle
{
width
:
32px
;
height
:
32px
;
margin
:
0
5px
;
}
</
style
>
</
style
>
src/components/director/directorGoodsList.vue
View file @
92ebb08b
...
@@ -52,10 +52,6 @@
...
@@ -52,10 +52,6 @@
<span
@
click=
"Clearconditions"
v-if=
"msg.Name!='' || msg.CategoryIds!='' || (dateList && dateList.length>0)"
class=
'blue point'
>
清空筛选条件
</span>
<span
@
click=
"Clearconditions"
v-if=
"msg.Name!='' || msg.CategoryIds!='' || (dateList && dateList.length>0)"
class=
'blue point'
>
清空筛选条件
</span>
</div>
</div>
<div
style=
"margin-top:15px"
>
<div
style=
"margin-top:15px"
>
<el-button
@
click=
"tableSet(4)"
style=
"margin-left:10px;"
size=
"mini"
>
上架
</el-button>
<el-button
@
click=
"tableSet(5)"
style=
"margin-left:10px;"
size=
"mini"
>
下架
</el-button>
<el-button
@
click=
"tableSet(6)"
style=
"margin-left:10px;"
size=
"mini"
>
删除
</el-button>
<el-button
@
click=
"plsetBtn"
style=
"margin-left:10px;"
size=
"mini"
>
批量设置
</el-button>
</div>
</div>
<el-table
<el-table
...
@@ -73,24 +69,13 @@
...
@@ -73,24 +69,13 @@
<el-table-column
<el-table-column
prop=
"Id"
prop=
"Id"
width=
"80"
width=
"80"
sortable
label=
"ID"
>
label=
"ID"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"address"
sortable
sortable
width=
"100"
prop=
"Sort"
label=
"排序"
>
label=
"排序"
>
<template
slot-scope=
"scope"
>
<template
v-if=
"!scope.row.editsort"
>
<span>
{{
scope
.
row
.
Sort
}}
</span>
<img
@
click=
"scope.row.editsort=true,scope.row.SortNew=scope.row.Sort"
style=
"width:15px;height:15px;margin-left:7px"
src=
"../../assets/img/userman/edit1.png"
alt=
""
>
</
template
>
<
template
v-else
>
<el-input
v-model=
"scope.row.SortNew"
type=
"number"
min=
"1"
size=
"small"
style=
"display:inline-block;width:70px"
></el-input>
<span
@
click=
"scope.row.editsort=false"
class=
"el-icon-error"
style=
"color: rgb(245, 108, 108);"
></span>
<span
@
click=
"Edit(scope.row,1)"
class=
"el-icon-success"
style=
"color:#67c23a"
></span>
</
template
>
</template>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"Remark"
prop=
"Remark"
...
@@ -107,12 +92,12 @@
...
@@ -107,12 +92,12 @@
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"address"
prop=
"address"
width=
"
3
00"
width=
"
4
00"
label=
"商品名称"
>
label=
"商品名称"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
flex=
"box:first"
>
<div
flex=
"box:first"
>
<img
style=
"width:50px;height:50px;margin-right:1px"
:src=
"scope.row.CoverImage"
alt=
""
>
<img
style=
"width:50px;height:50px;margin-right:1px"
:src=
"scope.row.CoverImage"
alt=
""
>
<template
v-if=
"!scope.row.editname"
>
<template>
<div
flex=
"cross:top"
style=
"display:inline-flex"
>
<div
flex=
"cross:top"
style=
"display:inline-flex"
>
<div
flex=
"dir:left"
>
<div
flex=
"dir:left"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"scope.row.Name"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"scope.row.Name"
placement=
"top"
>
...
@@ -120,15 +105,10 @@
...
@@ -120,15 +105,10 @@
<span>
{{
scope
.
row
.
Name
}}
</span>
<span>
{{
scope
.
row
.
Name
}}
</span>
</div>
</div>
</el-tooltip>
</el-tooltip>
<img
@
click=
"scope.row.editname=true,scope.row.NameNew=scope.row.Name"
style=
"width:15px;height:15px;margin-left:7px"
src=
"../../assets/img/userman/edit1.png"
alt=
""
>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
template
v-else
>
<el-input
v-model=
"scope.row.NameNew"
size=
"small"
style=
"display:inline-block;width:150px"
></el-input>
<span
@
click=
"scope.row.editname=false"
class=
"el-icon-error"
style=
"margin-left:5px;color: rgb(245, 108, 108);position: relative;top: 9px;"
></span>
<span
@
click=
"Edit(scope.row,2)"
class=
"el-icon-success"
style=
"color:#67c23a;position: relative;top: 9px;"
></span>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -139,50 +119,15 @@
...
@@ -139,50 +119,15 @@
sortable
sortable
label=
"售价"
>
label=
"售价"
>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"InventoryNum"
width=
"100"
sortable
label=
"库存"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.InventoryNum==0"
style=
"color:red"
>
售罄
</span>
<span
v-else
>
{{
scope
.
row
.
InventoryNum
}}
</span>
</
template
>
</el-table-column>
<el-table-column
<el-table-column
width=
"120"
width=
"120"
label=
"已出售量"
prop=
"GoodsBuyNum"
>
>
<
template
slot=
"header"
>
已出售量
<el-tooltip
effect=
"dark"
content=
"已出售量=实际销量+虚拟销量,按实际销量排序"
placement=
"top"
>
<i
class=
"el-icon-info"
></i>
</el-tooltip>
</
template
>
<
template
slot-scope=
"scope"
>
<span
>
{{
scope
.
row
.
GoodsBuyNum
}}
+
{{
scope
.
row
.
SalesNum
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"UpdateDate"
width=
"110"
label=
"是否加入快速购买"
>
<
template
slot-scope=
"scope"
>
<el-switch
@
change=
"Edit(scope.row,10)"
v-model=
"scope.row.IsQuickBuy"
active-color=
"#409EFF"
:active-value=
"1"
:inactive-value=
"0"
>
</el-switch>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"CreateDate"
prop=
"CreateDate"
sortable
width=
"160"
width=
"160"
label=
"添加时间"
>
label=
"添加时间"
>
</el-table-column>
</el-table-column>
...
@@ -277,128 +222,8 @@
...
@@ -277,128 +222,8 @@
<el-button
@
click=
"chooseFl"
size=
"small"
type=
"primary"
>
确 定
</el-button>
<el-button
@
click=
"chooseFl"
size=
"small"
type=
"primary"
>
确 定
</el-button>
</span>
</span>
</el-dialog>
</el-dialog>
<!-- 批量修改 -->
<el-dialog
custom-class=
"plxg"
title=
"批量修改"
:visible
.
sync=
"plDig"
width=
"960px"
>
<span
class=
"absoSpan"
>
已选商品{{GoodsIds.length}}个
</span>
<div
class=
"batch-remark c99 f14"
>
注:每次只能修改一项,修改后点击确定即可生效。如需修改多项,需多次操作。
</div>
<div
style=
"margin-top:15px"
flex=
"dir:left box:first"
>
<div
flex=
"dir:top"
class=
"batch-box-left"
>
<div
flex=
"main:center"
@
click=
"ClearSelect(7)"
:class=
"plszMsg.Type==7?'batch-div-active':''"
>
运费
</div>
<div
flex=
"main:center"
@
click=
"ClearSelect(8)"
:class=
"plszMsg.Type==8?'batch-div-active':''"
>
限购
</div>
<div
flex=
"main:center"
@
click=
"ClearSelect(9)"
:class=
"plszMsg.Type==9?'batch-div-active':''"
>
积分
</div>
<div
flex=
"main:center"
@
click=
"ClearSelect(10)"
:class=
"plszMsg.Type==10?'batch-div-active':''"
>
快速购买
</div>
<div
flex=
"main:center"
@
click=
"ClearSelect(11)"
:class=
"plszMsg.Type==11?'batch-div-active':''"
>
面议
</div>
<div
flex=
"main:center"
@
click=
"ClearSelect(12)"
:class=
"plszMsg.Type==12?'batch-div-active':''"
>
供应商
</div>
</div>
<div
class=
"batch-box-right"
>
<el-form
class=
"app-batch"
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"100px"
>
<el-form-item
v-if=
"plszMsg.Type==7"
label=
"运费设置"
>
<el-tag
v-if=
"ruleSelect.RulesName"
@
close=
"plszMsg.FreightId=0,ruleSelect={}"
closable
>
{{ruleSelect.RulesName}}
</el-tag>
<el-button
@
click=
"chooseyfDig=true"
style=
"margin-left:10px;"
size=
"small"
>
选择运费
</el-button>
</el-form-item>
<el-form-item
v-if=
"plszMsg.Type==8"
label=
"每人限购"
>
<el-form-item
label-width=
"50px"
label=
"商品"
>
<el-input
:disabled=
"BuyGoodsNumState"
v-model=
"plszMsg.LimitBuyGoodsNum"
style=
"width:254px;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<el-button
slot=
"append"
>
件
</el-button>
</el-input>
<el-checkbox
@
change=
"goodChange(BuyGoodsNumState,1)"
style=
"margin-left:10px"
v-model=
"BuyGoodsNumState"
>
不限制
</el-checkbox>
</el-form-item>
<el-form-item
label-width=
"50px"
label=
"订单"
>
<el-input
:disabled=
"BuyOrderNumState"
v-model=
"plszMsg.LimitBuyOrderNum"
style=
"width:254px;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<el-button
slot=
"append"
>
单
</el-button>
</el-input>
<el-checkbox
@
change=
"goodChange(BuyOrderNumState,2)"
style=
"margin-left:10px"
v-model=
"BuyOrderNumState"
>
不限制
</el-checkbox>
</el-form-item>
</el-form-item>
<
template
v-if=
"plszMsg.Type==9"
>
<el-form-item
label=
"积分赠送"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"top"
style=
"position: absolute;left: -10px;top:12px"
>
<div
slot=
"content"
>
用户购物赠送的积分, 如果不填写或填写0,则默认为不赠送积分
<br/>
如果为百分比则为按成交价格的比例计算积分
<br/>
如: 购买2件,设置10 积分, 不管成交价格是多少, 则购买后获得20积分
<br/>
如: 购买2件,设置10%积分, 成交价格2 * 200= 400, 则购买后获得 40 积分(400*10%)
<br/>
</div>
<i
class=
"el-tooltip el-icon-info"
></i>
</el-tooltip>
<el-input
v-model=
"plszMsg.IntegralPresent"
style=
"width:670px;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<el-button
slot=
"append"
>
分
<el-radio
v-model=
"plszMsg.IntegralPresentType"
:label=
"2"
>
固定值
</el-radio>
<el-radio
v-model=
"plszMsg.IntegralPresentType"
:label=
"1"
>
百分比
</el-radio>
</el-button>
</el-input>
</el-form-item>
<el-form-item
label=
"积分抵扣"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"如果设置0,则不支持积分抵扣 如果带%则为按成交价格的比例计算抵扣多少元"
placement=
"top"
style=
"position: absolute;left: -10px;top:12px"
>
<i
class=
"el-tooltip el-icon-info"
></i>
</el-tooltip>
<el-input
v-model=
"plszMsg.PointsDeduction"
style=
"width:670px;margin-left:15px"
type=
"number"
min=
"1"
size=
"small"
placeholder=
"请输入内容"
class=
"input-with-select"
>
<template
slot=
"prepend"
>
最多抵扣
</
template
>
<el-button
slot=
"append"
>
分
<el-radio
v-model=
"plszMsg.PointsDeductionType"
:label=
"2"
>
固定值
</el-radio>
<el-radio
v-model=
"plszMsg.PointsDeductionType"
:label=
"1"
>
百分比
</el-radio>
</el-button>
</el-input>
</el-form-item>
<el-form-item
label-width=
"110px"
>
<el-checkbox
v-model=
"plszMsg.IsMultipleDeduction"
:true-label=
"1"
:false-label=
"2"
>
允许多件抵扣
</el-checkbox>
</el-form-item>
</template>
<el-form-item
v-if=
"plszMsg.Type==10"
label-width=
"160px"
label=
"是否加入快速购买"
>
<el-switch
v-model=
"plszMsg.IsQuickBuy"
active-color=
"#409EFF"
:active-value=
"1"
:inactive-value=
"0"
>
</el-switch>
</el-form-item>
<el-form-item
class=
"spmy"
v-if=
"plszMsg.Type==11"
label-width=
"160px"
label=
"是否加入商品面议"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"如果开启面议,则商品无法在线支付"
placement=
"top"
style=
"position: absolute;left: -22px;top:12px"
>
<i
class=
"el-tooltip el-icon-info"
></i>
</el-tooltip>
<el-switch
v-model=
"plszMsg.IsGoodsNegotiable"
active-color=
"#409EFF"
:active-value=
"1"
:inactive-value=
"0"
>
</el-switch>
</el-form-item>
<el-form-item
class=
"spmy"
v-if=
"plszMsg.Type==12"
label-width=
"160px"
label=
"供应商"
>
<el-select
class=
"w150"
style=
"margin-right: 10px;"
v-model=
"plszMsg.SupplierId"
size=
"small"
placeholder=
"请选择"
@
change=
'changeSupplier'
>
<el-option
v-for=
"item in options"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
</div>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"plDig = false"
>
取 消
</el-button>
<el-button
@
click=
"plsetOk"
size=
"small"
type=
"primary"
>
确 定
</el-button>
</span>
</el-dialog>
<!-- 选择运费 -->
<el-dialog
title=
"选择运费"
top=
"2%"
:modal=
"false"
:modal-append-to-body=
'false'
:visible
.
sync=
"chooseyfDig"
width=
"25%"
>
<div>
<el-radio-group
v-model=
"val"
>
<el-radio
@
change=
"YfSelect"
class=
"yfradio"
v-for=
"(item,index) in ruleList"
:key=
"index"
:label=
"item"
>
{{item.RulesName}}
</el-radio>
</el-radio-group>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"chooseyfDig = false,ruleSelect={},plszMsg.FreightId=0"
>
取 消
</el-button>
<el-button
size=
"small"
@
click=
"chooseyfDig = false"
type=
"primary"
>
确 定
</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -407,7 +232,6 @@
...
@@ -407,7 +232,6 @@
name
:
"directorProductList"
,
name
:
"directorProductList"
,
data
(){
data
(){
return
{
return
{
chooseyfDig
:
false
,
plDig
:
false
,
plDig
:
false
,
flDig
:
false
,
flDig
:
false
,
val
:
''
,
val
:
''
,
...
@@ -599,42 +423,7 @@
...
@@ -599,42 +423,7 @@
tableSelect
(
val
){
tableSelect
(
val
){
this
.
GoodsIds
=
val
;
this
.
GoodsIds
=
val
;
},
},
// 上架 下架 删除
tableSet
(
num
){
if
(
this
.
GoodsIds
.
length
==
0
){
this
.
Error
(
"请先勾选要设置的商品!"
);
return
;
}
let
idList
=
[];
this
.
GoodsIds
.
forEach
(
item
=>
{
idList
.
push
(
item
.
Id
)
})
let
GoodsIds
=
idList
.
join
(
','
);
let
msg
=
{
GoodsIds
:
GoodsIds
,
Type
:
num
,
}
let
str
=
""
;
if
(
num
==
4
){
str
=
"批量上架,是否继续"
;
}
if
(
num
==
5
){
str
=
"批量下架,是否继续"
;
}
if
(
num
==
6
){
str
=
"是否确认删除选中的商品?"
;
}
let
that
=
this
;
that
.
$confirm
(
str
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
commonSet
(
msg
);
}).
catch
(()
=>
{
});
},
Edit
(
row
,
num
){
Edit
(
row
,
num
){
let
addMsg
=
{
let
addMsg
=
{
GoodsIds
:
row
.
Id
,
GoodsIds
:
row
.
Id
,
...
@@ -753,7 +542,7 @@
...
@@ -753,7 +542,7 @@
msg
.
Id
=
0
;
msg
.
Id
=
0
;
}
}
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipost
(
"/api/
product/GetProduc
tGoodsPageList"
,
msg
,
res
=>
{
this
.
apipost
(
"/api/
GuideCar/Ge
tGoodsPageList"
,
msg
,
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
...
@@ -810,7 +599,7 @@
...
@@ -810,7 +599,7 @@
});
});
},
},
getSort
(
val
){
//列表的升序降序
getSort
(
val
){
//列表的升序降序
if
(
val
.
prop
==
'
Id
'
){
if
(
val
.
prop
==
'
CreateDate
'
){
if
(
val
.
order
==
'ascending'
){
if
(
val
.
order
==
'ascending'
){
this
.
msg
.
OrderBy
=
1
this
.
msg
.
OrderBy
=
1
}
else
if
(
val
.
order
==
'descending'
){
}
else
if
(
val
.
order
==
'descending'
){
...
@@ -818,7 +607,7 @@
...
@@ -818,7 +607,7 @@
}
else
{
}
else
{
this
.
msg
.
OrderBy
=
0
this
.
msg
.
OrderBy
=
0
}
}
}
else
if
(
val
.
prop
==
'
address
'
){
}
else
if
(
val
.
prop
==
'
Sort
'
){
if
(
val
.
order
==
'ascending'
){
if
(
val
.
order
==
'ascending'
){
this
.
msg
.
OrderBy
=
3
this
.
msg
.
OrderBy
=
3
}
else
if
(
val
.
order
==
'descending'
){
}
else
if
(
val
.
order
==
'descending'
){
...
@@ -834,14 +623,6 @@
...
@@ -834,14 +623,6 @@
}
else
{
}
else
{
this
.
msg
.
OrderBy
=
0
this
.
msg
.
OrderBy
=
0
}
}
}
else
if
(
val
.
prop
==
'InventoryNum'
){
if
(
val
.
order
==
'ascending'
){
this
.
msg
.
OrderBy
=
7
}
else
if
(
val
.
order
==
'descending'
){
this
.
msg
.
OrderBy
=
8
}
else
{
this
.
msg
.
OrderBy
=
0
}
}
}
this
.
getList
()
this
.
getList
()
},
},
...
...
src/components/director/guideCarSiteList.vue
View file @
92ebb08b
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<div
style=
"display: flex;flex-direction: row;align-items: center"
>
<div
style=
"display: flex;flex-direction: row;align-items: center"
>
<div
class=
"block"
>
<div
class=
"block"
style=
"display: flex;flex-direction: row;justify-content: space-between;width: 100%;"
>
<div
class=
"searchInput"
style=
"width:250px"
>
<div
class=
"searchInput"
style=
"width:250px"
>
<el-input
style=
"display:inline-block;width:225px;height:30px"
<el-input
style=
"display:inline-block;width:225px;height:30px"
placeholder=
"请输入站点名称搜索"
placeholder=
"请输入站点名称搜索"
...
@@ -20,6 +20,10 @@
...
@@ -20,6 +20,10 @@
</el-input>
</el-input>
<span
@
click=
"getList"
class=
"el-icon-search"
style=
"color:#979dad;font-size:14px;position:relative;top:1px"
></span>
<span
@
click=
"getList"
class=
"el-icon-search"
style=
"color:#979dad;font-size:14px;position:relative;top:1px"
></span>
</div>
</div>
<div
style=
"display: flex;flex-direction: row;"
>
<el-button
type=
"primary"
@
click=
"SetProduct(1)"
size=
"small"
>
开启
</el-button>
<el-button
type=
"primary"
@
click=
"SetProduct(0)"
size=
"small"
>
关闭
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -31,7 +35,9 @@
...
@@ -31,7 +35,9 @@
header-cell-class-name=
"headClass"
header-cell-class-name=
"headClass"
style=
"width: 100%"
style=
"width: 100%"
border
border
@
selection-change=
"handleSelectionChange"
>
>
<el-table-column
type=
"selection"
width=
"55"
style=
"text-align:center;"
></el-table-column>
<el-table-column
<el-table-column
prop=
"ID"
prop=
"ID"
...
@@ -103,7 +109,11 @@
...
@@ -103,7 +109,11 @@
},
},
tableData
:[],
tableData
:[],
count
:
0
,
count
:
0
,
loading
:
false
loading
:
false
,
EnableMsg
:{
Ids
:
''
,
IsEnable
:
0
,
},
}
}
},
},
created
(){
created
(){
...
@@ -131,7 +141,7 @@
...
@@ -131,7 +141,7 @@
Edit
(
row
){
Edit
(
row
){
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
'add
Coupon
'
,
name
:
'add
Site
'
,
query
:
{
query
:
{
ID
:
row
.
ID
,
ID
:
row
.
ID
,
blank
:
"y"
blank
:
"y"
...
@@ -156,13 +166,39 @@
...
@@ -156,13 +166,39 @@
});
});
},
},
changeEnabled
(
item
){
changeEnabled
(
item
){
// this.apipost("/api/MallBase/AddOrUpdateIsEnable",{Id:item.ID,IsEnable:item.IsEnable}, res => {
this
.
EnableMsg
.
Ids
=
item
.
ID
;
// if(res.data.resultCode==1){
this
.
EnableMsg
.
IsEnable
=
item
.
IsEnable
;
// this.Success(res.data.message)
this
.
enableGuideCar
()
// this.getList()
// }
},
// })
enableGuideCar
(){
this
.
apipost
(
"/api/GuideCar/EnableGuideCarSiteInfo"
,
this
.
EnableMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
this
.
Success
(
res
.
data
.
message
)
this
.
getList
()
}
})
},
SetProduct
(
type
){
this
.
EnableMsg
.
IsEnable
=
type
;
if
(
this
.
EnableMsg
.
Ids
.
length
==
0
){
this
.
Info
(
'请选择站点'
);
return
}
this
.
EnableMsg
.
Ids
=
this
.
EnableMsg
.
Ids
.
join
(
","
);
this
.
enableGuideCar
()
},
handleSelectionChange
(
val
){
var
selectRow
=
JSON
.
parse
(
JSON
.
stringify
(
val
));
let
array
=
[];
selectRow
.
forEach
(
x
=>
{
let
obj
=
{}
obj
=
x
.
ID
;
array
.
push
(
obj
)
});
this
.
EnableMsg
.
Ids
=
array
},
},
getList
(){
getList
(){
this
.
msg
.
pageIndex
=
1
this
.
msg
.
pageIndex
=
1
this
.
getDateList
()
this
.
getDateList
()
...
@@ -211,4 +247,7 @@
...
@@ -211,4 +247,7 @@
padding
:
15px
;
padding
:
15px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
}
.guideCarSiteList
.el-tag
{
margin-right
:
5px
;
}
</
style
>
</
style
>
src/components/orderMan/customerEvaluation.vue
View file @
92ebb08b
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<div
class=
"app-gallery-item"
style=
"position: relative;width: 100px;margin-top: 10px;"
>
<div
class=
"app-gallery-item"
style=
"position: relative;width: 100px;margin-top: 10px;"
>
<img
v-if=
"!addMsg.userPath || addMsg.userPath==''"
<img
v-if=
"!addMsg.userPath || addMsg.userPath==''"
src=
"../../assets/img/default.png"
style=
"width:80px;height:80px"
alt=
""
>
src=
"../../assets/img/default.png"
style=
"width:80px;height:80px"
alt=
""
>
<img
style=
"width:80px;height:80px"
:src=
"
domainManager().ImageUrl+
addMsg.userPath"
<img
style=
"width:80px;height:80px"
:src=
"addMsg.userPath"
alt=
""
>
alt=
""
>
</div>
</div>
</el-form-item>
</el-form-item>
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
<div
class=
"app-gallery-item"
style=
"position: relative;width: 100px;margin-top: 10px;"
>
<div
class=
"app-gallery-item"
style=
"position: relative;width: 100px;margin-top: 10px;"
>
<img
v-if=
"!addMsg.pjPath || addMsg.pjPath==''"
<img
v-if=
"!addMsg.pjPath || addMsg.pjPath==''"
src=
"../../assets/img/default.png"
style=
"width:80px;height:80px"
alt=
""
>
src=
"../../assets/img/default.png"
style=
"width:80px;height:80px"
alt=
""
>
<img
style=
"width:80px;height:80px"
:src=
"
domainManager().ImageUrl+
addMsg.pjPath"
<img
style=
"width:80px;height:80px"
:src=
"addMsg.pjPath"
alt=
""
>
alt=
""
>
</div>
</div>
</el-form-item>
</el-form-item>
...
@@ -81,7 +81,7 @@
...
@@ -81,7 +81,7 @@
</div>
</div>
<!-- 选择文件 -->
<!-- 选择文件 -->
<el-dialog
title=
"选择文件"
:visible
.
sync=
"changeState"
width=
"1240px"
>
<el-dialog
title=
"选择文件"
:visible
.
sync=
"changeState"
width=
"1240px"
>
<ChooseImg
@
SelectId=
"SelectId"
></ChooseImg>
<ChooseImg
@
SelectId=
"SelectId"
></ChooseImg>
</el-dialog>
</el-dialog>
</div>
</div>
</
template
>
</
template
>
...
@@ -142,17 +142,22 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
...
@@ -142,17 +142,22 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
this
.
getTemplate
();
this
.
getTemplate
();
this
.
getList
();
this
.
getList
();
this
.
getplat
();
this
.
getplat
();
},
},
methods
:
{
methods
:
{
SelectId
(
msg
){
SelectId
(
msg
){
if
(
this
.
imgType
==
1
){
if
(
this
.
imgType
==
1
){
this
.
addMsg
.
UserPhoto
=
msg
.
selectId
;
let
url
=
this
.
getIconLink
(
msg
.
url
)
this
.
addMsg
.
userPath
=
msg
.
url
;
console
.
log
(
url
)
this
.
addMsg
.
UserPhoto
=
msg
.
selectId
;
this
.
addMsg
.
userPath
=
url
;
}
}
if
(
this
.
imgType
==
2
){
if
(
this
.
imgType
==
2
){
this
.
addMsg
.
CommentImgList
=
[
msg
.
selectId
];
let
url
=
this
.
getIconLink
(
msg
.
url
)
this
.
addMsg
.
pjPath
=
msg
.
url
;
console
.
log
(
url
)
this
.
addMsg
.
CommentImgList
=
[
url
];
this
.
addMsg
.
pjPath
=
url
;
}
}
this
.
changeState
=
false
;
this
.
changeState
=
false
;
},
},
...
@@ -181,7 +186,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
...
@@ -181,7 +186,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
let
pageData
=
res
.
data
.
data
.
pageData
;
let
pageData
=
res
.
data
.
data
.
pageData
;
this
.
tableData
=
pageData
;
this
.
tableData
=
pageData
;
}
}
})
})
},
},
getplat
(){
getplat
(){
...
@@ -194,7 +199,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
...
@@ -194,7 +199,7 @@ import ChooseImg from "@/components/global/ChooseImg.vue";
this
.
templateList
=
res
.
data
.
data
;
this
.
templateList
=
res
.
data
.
data
;
})
})
},
},
},
},
mounted
()
{
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