Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录
切换导航
S
shop-new
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
王天霸
shop-new
Commits
973ad4fa
提交
973ad4fa
authored
3 年前
作者:
郑伟娜
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '云仓3.1.1' into test
上级
45a431d4
d7536c89
隐藏空白字符变更
内嵌
并排
正在显示
32 个修改的文件
包含
997 行增加
和
130 行删除
+997
-130
freight.js
src/api/module/freight.js
+9
-0
index.vue
src/components/HeaderSearch/index.vue
+1
-1
ScrollPane.vue
src/layout/components/TagsView/ScrollPane.vue
+1
-1
agreement.vue
src/views/entry/agreement.vue
+1
-1
fillBrandInf.vue
src/views/entry/fillBrandInf.vue
+6
-6
fillMainInf.vue
src/views/entry/fillMainInf.vue
+6
-6
fillShopInf.vue
src/views/entry/fillShopInf.vue
+6
-6
newyuncang.vue
src/views/entry/newyuncang.vue
+1
-1
index.vue
src/views/system/asset/explain/index.vue
+1
-1
wddetails.vue
src/views/system/asset/wddetails.vue
+2
-2
index.vue
src/views/system/asset/withdraw/index.vue
+2
-2
index.vue
src/views/system/freight/freight_list/index.vue
+55
-9
templateFreight.vue
src/views/system/freight/freight_list/templateFreight.vue
+812
-0
goodsimg.vue
src/views/system/goods/add/components/goodsimg.vue
+3
-3
goodsinfomation.vue
src/views/system/goods/add/components/goodsinfomation.vue
+5
-5
goodsparameter.vue
src/views/system/goods/add/components/goodsparameter.vue
+5
-5
goodsdetail.vue
src/views/system/goodsimport/components/goodsdetail.vue
+2
-2
editgoods.vue
src/views/system/goodsimport/editgoods.vue
+1
-1
goodsgement.vue
src/views/system/goodsimport/goodsgement.vue
+4
-4
index.vue
src/views/system/goodsimport/index.vue
+5
-5
document.vue
src/views/system/operation/document.vue
+5
-5
helpDoc.vue
src/views/system/operation/helpDoc.vue
+1
-1
orderDetail.vue
src/views/system/order/components/orderDetail.vue
+12
-12
index.vue
src/views/system/order/index.vue
+11
-11
index2.vue
src/views/system/order/index2.vue
+4
-4
edit.vue
src/views/system/retreat/edit.vue
+1
-1
index.vue
src/views/system/retreat/retreat/index.vue
+11
-11
index0907.vue
src/views/system/retreat/retreat/index0907.vue
+3
-3
index_bak.vue
src/views/system/retreat/retreat/index_bak.vue
+1
-1
setpsd.vue
src/views/system/settings/setpsd.vue
+1
-1
brand.vue
src/views/system/shop/brand.vue
+8
-8
index.vue
src/views/system/shop/index.vue
+11
-11
没有找到文件。
src/api/module/freight.js
浏览文件 @
973ad4fa
...
...
@@ -45,3 +45,12 @@ export function delFreight(ids) {
})
}
// 获取全部地址
export
function
addressList
(
data
)
{
return
request
({
url
:
'/local/address/getAddressList'
,
method
:
'post'
,
data
:
data
})
}
This diff is collapsed.
Click to expand it.
src/components/HeaderSearch/index.vue
浏览文件 @
973ad4fa
...
...
@@ -159,7 +159,7 @@ export default {
display
:
inline-block
;
vertical-align
:
middle
;
/
deep
/
.el-input__inner
{
::v-deep
.el-input__inner
{
border-radius
:
0
;
border
:
0
;
padding-left
:
0
;
...
...
This diff is collapsed.
Click to expand it.
src/layout/components/TagsView/ScrollPane.vue
浏览文件 @
973ad4fa
...
...
@@ -73,7 +73,7 @@ export default {
position
:
relative
;
overflow
:
hidden
;
width
:
100%
;
/
deep
/
{
::v-deep
{
.el-scrollbar__bar
{
bottom
:
0px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/entry/agreement.vue
浏览文件 @
973ad4fa
...
...
@@ -163,7 +163,7 @@
width
:
80%
;
margin
:
30px
auto
30px
;
height
:
calc
(
100%
-
120px
);
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
120px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
...
...
This diff is collapsed.
Click to expand it.
src/views/entry/fillBrandInf.vue
浏览文件 @
973ad4fa
...
...
@@ -670,7 +670,7 @@
width
:
80%
;
margin
:
30px
auto
30px
;
height
:
calc
(
100%
-
120px
);
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
120px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
...
...
@@ -772,30 +772,30 @@
.uploadData
{
display
:
inline-block
;
/
deep
/
.el-upload--picture-card
{
::v-deep
.el-upload--picture-card
{
width
:
100px
;
height
:
100px
;
}
/
deep
/
.el-upload
{
::v-deep
.el-upload
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.avatar
{
::v-deep
.avatar
{
width
:
100px
;
height
:
100px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/entry/fillMainInf.vue
浏览文件 @
973ad4fa
...
...
@@ -813,7 +813,7 @@
width
:
80%
;
margin
:
30px
auto
30px
;
height
:
calc
(
100%
-
140px
);
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
140px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
...
...
@@ -887,26 +887,26 @@
// 上传图片样式
.uploadData
{
display
:
inline-block
;
/
deep
/
.el-upload--picture-card
{
::v-deep
.el-upload--picture-card
{
width
:
100px
;
height
:
100px
;
}
/
deep
/
.el-upload
{
::v-deep
.el-upload
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.avatar
{
::v-deep
.avatar
{
width
:
100px
;
height
:
100px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/entry/fillShopInf.vue
浏览文件 @
973ad4fa
...
...
@@ -584,7 +584,7 @@
width
:
80%
;
margin
:
30px
auto
30px
;
height
:
calc
(
100%
-
140px
);
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
180px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
...
...
@@ -667,30 +667,30 @@
.uploadData
{
display
:
inline-block
;
/
deep
/
.el-upload--picture-card
{
::v-deep
.el-upload--picture-card
{
width
:
100px
;
height
:
100px
;
}
/
deep
/
.el-upload
{
::v-deep
.el-upload
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.avatar
{
::v-deep
.avatar
{
width
:
100px
;
height
:
100px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/entry/newyuncang.vue
浏览文件 @
973ad4fa
...
...
@@ -1262,7 +1262,7 @@
overflow
:
hidden
;
}
/
deep
/
.is-active
{
::v-deep
.is-active
{
border
:
1px
solid
#e9e9e9
;
background
:
#fff
;
overflow
:
hidden
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/asset/explain/index.vue
浏览文件 @
973ad4fa
...
...
@@ -87,7 +87,7 @@
</
script
>
<
style
scoped
>
/
deep
/
.explain
.el-card__body
{
::v-deep
.explain
.el-card__body
{
height
:
100%
;
/*padding: 30px 20px;*/
overflow
:
auto
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/asset/wddetails.vue
浏览文件 @
973ad4fa
...
...
@@ -513,7 +513,7 @@
</
script
>
<
style
scoped
>
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
100%
;
overflow
:
hidden
;
}
...
...
@@ -569,7 +569,7 @@
color
:
#333
;
}
/
deep
/
.el-col
{
::v-deep
.el-col
{
border
:
1px
solid
#eee
;
padding
:
0
10px
;
height
:
45px
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/asset/withdraw/index.vue
浏览文件 @
973ad4fa
...
...
@@ -276,7 +276,7 @@
};
</
script
>
<
style
scoped
>
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
100%
;
overflow
:
hidden
;
}
...
...
@@ -291,7 +291,7 @@
margin-bottom
:
26px
;
}
/
deep
/
.spe-code-con-item
.el-input-group__append
{
::v-deep
.spe-code-con-item
.el-input-group__append
{
cursor
:
pointer
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/freight/freight_list/index.vue
浏览文件 @
973ad4fa
...
...
@@ -66,16 +66,33 @@
@
pagination=
"getList"
/>
<!-- 添加或修改freight对话框 -->
<el-dialog
:title=
"title"
:visible
.
sync=
"isOpen"
v-if=
"isOpen"
width=
"70%"
class=
"freightTemplate-add"
<
!-- <
el-dialog :title="title" :visible.sync="isOpen" v-if="isOpen" width="70%" class="freightTemplate-add"
:close-on-click-modal="false" center>
<IndexBtn :option="form" @closeIndexbtn="closeDialog"/>
</el-dialog>
</el-dialog> -->
<el-drawer
:title=
"title"
:withHeader=
"false"
:destroy-on-close=
'true'
:append-to-body=
"false"
:modal=
'false'
:modal-append-to-body=
'false'
:visible
.
sync=
"isOpen"
v-if=
"isOpen"
direction=
"rtl"
style=
"position:absolute;height:100%;"
size=
"100%"
>
<
template
-freight
:option=
"form"
:address-all=
"addressAll"
@
closeIndexbtn=
"closeDialog"
/>
</el-drawer>
</el-card>
</div>
</
template
>
<
script
>
import
IndexBtn
from
'./indexbtn'
import
{
listFreight
,
getFreight
,
delFreight
,
addFreight
,
updateFreight
}
from
'@/api/module/freight'
import
TemplateFreight
from
'./templateFreight'
// import IndexBtn from './indexbtn'
import
{
listFreight
,
getFreight
,
delFreight
,
addFreight
,
updateFreight
,
addressList
}
from
'@/api/module/freight'
import
{
dateFormat
}
from
'@/utils'
export
default
{
...
...
@@ -122,18 +139,20 @@
name
:
[
{
required
:
true
,
message
:
"模板名称不能为空"
,
trigger
:
"blur"
}
],
}
},
addressAll
:
[]
};
},
components
:
{
IndexBtn
TemplateFreight
,
// IndexBtn
},
created
()
{
this
.
getList
();
this
.
$nextTick
(()
=>
{
this
.
fullHeight
=
document
.
getElementsByClassName
(
'box-card'
)[
0
].
clientHeight
})
this
.
getaddressList
()
},
watch
:
{
fullHeight
(
val
)
{
...
...
@@ -142,6 +161,29 @@
}
},
methods
:
{
// 获取全部地区
getaddressList
()
{
addressList
().
then
(
res
=>
{
if
(
res
.
code
==
1
)
{
this
.
addressAll
=
this
.
getTreeData
(
res
.
data
)
}
})
},
// 处理最后一级显示暂无数据
getTreeData
(
data
)
{
for
(
let
i
=
0
,
len
=
data
.
length
;
i
<
len
;
i
++
)
{
if
(
data
[
i
].
type
>=
2
)
{
data
[
i
].
children
=
undefined
}
else
{
if
(
!
data
[
i
].
children
.
length
)
{
data
[
i
].
children
=
undefined
}
else
{
this
.
getTreeData
(
data
[
i
].
children
)
}
}
}
return
data
},
closeDialog
(
val
)
{
this
.
isOpen
=
val
;
this
.
getList
();
...
...
@@ -330,14 +372,18 @@
</
script
>
<
style
scoped
lang=
"scss"
type=
"text/stylus"
>
.freightTemplate-add
{
/
deep
/
.el-dialog
{
::v-deep
.el-dialog
{
height
:
80%
;
overflow
:
hidden
;
}
/
deep
/
.el-dialog__body
{
::v-deep
.el-dialog__body
{
height
:
calc
(
100%
-
60px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
}
}
::v-deep
.el-drawer__body
{
overflow-y
:
auto
;
}
</
style
>
This diff is collapsed.
Click to expand it.
src/views/system/freight/freight_list/templateFreight.vue
0 → 100644
浏览文件 @
973ad4fa
<
template
>
<div
style=
"height: 100%; overflow-y: auto;"
>
<div
style=
"text-align: right;"
>
<el-button
type=
"primary"
style=
"margin: 10px 20px 10px 7px;"
size=
'mini'
icon=
"el-icon-arrow-left"
plain
@
click=
"closeDialog"
>
返回列表
</el-button>
</div>
<el-card
style=
"margin: 0 20px;"
>
<h3
class=
"tipTitle"
>
运费计算规则
</h3>
<div
class=
"tipContent"
>
<p>
1、当【限制地区】有设置时,会优先验证,若用户的收货地址在【限制地区】范围内,则用户无法下单。
</p>
<p>
2、收货地址在【配送地区】范围内,根据【配送地区】设置的规则计算商品运费。
</p>
<p>
3、添加【配送地区】时,默认为全国,若单独设置【指定地区】后,会验证地区的配送规则,根据【指定地区】的设置进行运费计算
</p>
<p>
4、当商品的【配送地区】均不在设置范围内的时候,用户无法下单
</p>
</div>
</el-card>
<el-card
style=
"margin: 20px;"
>
<el-form
:model=
"ruleForm"
:rules=
"rules"
ref=
"ruleForm"
label-width=
"80px"
class=
"demo-ruleForm"
style=
"width: 80%;"
>
<el-form-item
label=
"排序"
prop=
"sort"
style=
"width: 400px;"
>
<el-input
v-model=
"ruleForm.sort"
@
input=
"onClickInputKeyBoard3('ruleForm', 'sort')"
></el-input>
</el-form-item>
<el-form-item
label=
"模板名称"
prop=
"name"
style=
"width: 400px;"
>
<el-input
v-model=
"ruleForm.name"
></el-input>
</el-form-item>
<el-form-item
label=
"是否默认"
>
<el-radio-group
v-model=
"ruleForm.is_default"
>
<el-radio
:label=
"1"
>
是
</el-radio>
<el-radio
:label=
"0"
>
否
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"计费方式"
>
<el-radio-group
v-model=
"ruleForm.charge_type"
>
<el-radio
:label=
"1"
>
按数量
</el-radio>
<el-radio
:label=
"2"
>
按重量
</el-radio>
<el-radio
:label=
"3"
>
按体积
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"配送地区"
>
<div>
<div
style=
"display: flex; justify-content: space-between; margin-bottom: 5px;"
>
<span
style=
"font-size: 12px; color: #85878A;"
>
除指定地区外,其余地区运费采用:“全国默认运费”
</span>
<div>
<el-button
plain
size=
"mini"
@
click=
"delDelivery('2')"
>
删除
</el-button>
<el-button
type=
"primary"
plain
size=
"mini"
@
click=
"addDelivery"
>
添加地区
</el-button>
</div>
</div>
<div
style=
"background: #F9F9FA; padding: 20px;"
>
<el-table
class=
"multipleTable"
ref=
"multipleTable"
:data=
"deliveryTableData"
tooltip-effect=
"dark"
style=
"width: 100%"
@
selection-change=
"handleSelectionChange"
>
<el-table-column
type=
"selection"
:selectable=
"selectEnable"
width=
"55"
>
</el-table-column>
<el-table-column
label=
"配送区域"
>
<template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.a.length && scope.row.a[0].province_id == 0"
>
【默认】全国
</div>
<div
v-if=
"scope.row.a.length && scope.row.a[0].province_id != 0"
>
【指定】
<span
v-for=
"(item, index) in scope.row.value"
:key=
"index"
>
<span>
{{
item
.
province_name
}}{{
item
.
city_name
.
length
?
`(${ item.city_name.join()
}
)`
:
''
}}
<
/span
>
<
span
v
-
if
=
"index < scope.row.value.length - 1"
>
,
&
nbsp
;
<
/span
>
<
/span
>
<
/div
>
<
div
v
-
if
=
"!scope.row.a.length"
style
=
"color: #1890ff; cursor: pointer;"
@
click
=
"editAddress(scope.row, scope.$index, 'add')"
>
【点击选择配送地区】
<
/div
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"name"
label
=
"首件(个)"
width
=
"150"
>
<
template
slot
=
"header"
slot
-
scope
=
"scope"
>
<
span
v
-
if
=
"ruleForm.charge_type == 1"
>
首件(个)
<
/span
>
<
span
v
-
if
=
"ruleForm.charge_type == 2"
>
首重(克)
<
/span
>
<
span
v
-
if
=
"ruleForm.charge_type == 3"
>
首件(立方米)
<
/span
>
<
/template
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
input
v
-
model
=
"scope.row.f"
class
=
"inputWidth"
@
input
=
"onClickInputKeyBoard2('deliveryTableData', scope.$index, 'f')"
><
/el-input
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"fp"
label
=
"运费(元)"
width
=
"150"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
input
v
-
model
=
"scope.row.fp"
class
=
"inputWidth"
@
input
=
"onClickInputKeyBoard('deliveryTableData', scope.$index, 'fp')"
><
/el-input
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"n"
label
=
"续件(个)"
width
=
"150"
>
<
template
slot
=
"header"
slot
-
scope
=
"scope"
>
<
span
v
-
if
=
"ruleForm.charge_type == 1"
>
续件(个)
<
/span
>
<
span
v
-
if
=
"ruleForm.charge_type == 2"
>
续重(克)
<
/span
>
<
span
v
-
if
=
"ruleForm.charge_type == 3"
>
续件(立方米)
<
/span
>
<
/template
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
input
v
-
model
=
"scope.row.n"
class
=
"inputWidth"
@
input
=
"onClickInputKeyBoard2('deliveryTableData', scope.$index, 'n')"
><
/el-input
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
prop
=
"np"
label
=
"续费(元)"
width
=
"150"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
input
v
-
model
=
"scope.row.np"
class
=
"inputWidth"
@
input
=
"onClickInputKeyBoard('deliveryTableData', scope.$index, 'np')"
><
/el-input
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"操作"
width
=
"120"
>
<
template
slot
-
scope
=
"scope"
v
-
if
=
"scope.$index > 0"
>
<
el
-
button
type
=
"text"
size
=
"small"
@
click
=
"delDelivery('1', scope.$index)"
>
删除
<
/el-button
>
<
el
-
button
type
=
"text"
size
=
"small"
@
click
=
"editAddress(scope.row, scope.$index)"
v
-
if
=
"scope.row.a.length"
>
修改地区
<
/el-button
>
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
/div
>
<
/div
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"限制地区"
>
<
div
>
<
div
style
=
"display: flex; justify-content: space-between; margin-bottom: 5px;"
>
<
span
style
=
"font-size: 12px; color: #85878A;"
>
收货地址在限制下单区域内的用户将无法完成下单
<
/span
>
<
div
>
<
el
-
button
type
=
"primary"
plain
size
=
"mini"
@
click
=
"addNoDelivery"
v
-
if
=
"!noDeliveryTableData.length"
>
添加地区
<
/el-button
>
<
/div
>
<
/div
>
<
div
style
=
"background: #F9F9FA; padding: 20px;"
>
<
el
-
table
class
=
"multipleTable"
:
data
=
"noDeliveryTableData"
tooltip
-
effect
=
"dark"
style
=
"width: 100%"
>
<!--
样式占位
-->
<
el
-
table
-
column
label
=
""
width
=
"10"
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"限制配送地区"
prop
=
"dis_dispatching"
>
<
template
slot
-
scope
=
"scope"
>
<
span
v
-
for
=
"(item, index) in scope.row.value"
:
key
=
"index"
>
<
span
>
{{
item
.
province_name
}}
{{
item
.
city_name
.
length
?
`(${ item.city_name.join()
}
)`
:
''
}}
<
/span
>
<
span
v
-
if
=
"index < scope.row.value.length - 1"
>
,
&
nbsp
;
<
/span
>
<
/span
>
<
/template
>
<
/el-table-column
>
<!--
样式占位
-->
<
el
-
table
-
column
label
=
""
width
=
"200"
>
<
/el-table-column
>
<
el
-
table
-
column
label
=
"操作"
width
=
"120"
>
<
template
slot
-
scope
=
"scope"
>
<
el
-
button
type
=
"text"
size
=
"small"
@
click
=
"noDeliveryTableData = []"
>
删除
<
/el-button
>
<
el
-
button
type
=
"text"
size
=
"small"
@
click
=
"editAddress(scope.row, scope.$index, 2)"
>
修改地区
<
/el-button
>
<
/template
>
<
/el-table-column
>
<
/el-table
>
<
/div
>
<
/div
>
<
/el-form-item
>
<
el
-
form
-
item
label
=
"启用状态"
>
<
el
-
radio
-
group
v
-
model
=
"ruleForm.publish"
>
<
el
-
radio
:
label
=
"1"
>
是
<
/el-radio
>
<
el
-
radio
:
label
=
"0"
>
否
<
/el-radio
>
<
/el-radio-group
>
<
/el-form-item
>
<
/el-form
>
<
div
style
=
"text-align: center;"
>
<
el
-
button
size
=
"mini"
@
click
=
"closeDialog"
>
取消
<
/el-button
>
<
el
-
button
type
=
"primary"
size
=
"mini"
@
click
=
"handleSubmit"
>
提交
<
/el-button
>
<
/div
>
<
/el-card
>
<
el
-
dialog
title
=
"选择地区"
:
visible
.
sync
=
"dialogAddress"
v
-
if
=
"dialogAddress"
width
=
"600px"
:
close
-
on
-
click
-
modal
=
"false"
:
append
-
to
-
body
=
"true"
>
<
div
style
=
"height: 500px;"
>
<
el
-
cascader
-
panel
ref
=
"cascaderPanel"
v
-
model
=
"selectAddress"
:
options
=
"addressOptions"
:
props
=
"props"
style
=
"height: 100%;"
><
/el-cascader-panel
>
<
/div
>
<
span
slot
=
"footer"
class
=
"dialog-footer"
>
<
el
-
button
@
click
=
"dialogAddress = false"
size
=
"mini"
>
取消
<
/el-button
>
<
el
-
button
type
=
"primary"
@
click
=
"saveAddress"
size
=
"mini"
>
提交
<
/el-button
>
<
/span
>
<
/el-dialog
>
<
/div
>
<
/template
>
<
script
>
import
{
addFreight
,
updateFreight
}
from
'@/api/module/freight'
export
default
{
props
:
{
option
:
{
type
:
Object
,
required
:
true
}
,
addressAll
:
{
type
:
Array
,
required
:
true
}
}
,
data
()
{
return
{
ruleForm
:
{
id
:
0
,
sort
:
0
,
name
:
''
,
is_default
:
0
,
charge_type
:
1
,
publish
:
0
}
,
// 表单校验
rules
:
{
sort
:
[
{
required
:
true
,
message
:
"排序不能为空"
,
trigger
:
"blur"
}
],
name
:
[
{
required
:
true
,
message
:
"模板名称不能为空"
,
trigger
:
"blur"
}
],
}
,
deliveryTableData
:
[
{
a
:
[{
province_id
:
0
,
province_name
:
'全国'
}
],
f
:
''
,
fp
:
''
,
n
:
''
,
np
:
''
}
],
noDeliveryTableData
:
[],
multipleSelection
:
[],
dialogAddress
:
false
,
props
:
{
multiple
:
true
,
value
:
'id'
,
label
:
'name'
}
,
addressOptions
:
[],
rowItem
:
null
,
rowItem2
:
null
,
selectAddress
:
[],
addType
:
1
// 1 配送添加 2不配送添加
}
}
,
mounted
()
{
this
.
addressOptions
=
this
.
addressAll
this
.
initData
()
}
,
methods
:
{
// 初始化数据
initData
()
{
if
(
this
.
option
.
id
==
0
)
{
this
.
ruleForm
=
{
id
:
0
,
sort
:
0
,
name
:
''
,
is_default
:
0
,
charge_type
:
1
,
publish
:
0
}
this
.
deliveryTableData
=
[
{
a
:
[{
province_id
:
0
,
province_name
:
'全国'
}
],
f
:
''
,
fp
:
''
,
n
:
''
,
np
:
''
}
]
this
.
noDeliveryTableData
=
[]
}
else
{
this
.
ruleForm
=
{
id
:
this
.
option
.
id
,
sort
:
this
.
option
.
sort
,
name
:
this
.
option
.
name
,
is_default
:
this
.
option
.
is_default
,
charge_type
:
this
.
option
.
charge_type
,
publish
:
this
.
option
.
publish
}
this
.
deliveryTableData
=
this
.
option
.
new_dispatching
if
(
this
.
option
.
new_dispatching
)
{
this
.
deliveryTableData
.
forEach
(
item
=>
{
item
.
fp
=
Number
(
item
.
fp
/
100
)
item
.
np
=
Number
(
item
.
np
/
100
)
item
.
value
=
this
.
getSelectData
(
item
.
a
)
item
.
id
=
this
.
getBackData
(
item
.
a
)
}
)
}
if
(
this
.
option
.
new_dis_dispatching
.
length
)
{
this
.
noDeliveryTableData
[
0
]
=
{
a
:
this
.
option
.
new_dis_dispatching
,
value
:
this
.
getSelectData
(
this
.
option
.
new_dis_dispatching
),
id
:
this
.
getBackData
(
this
.
option
.
new_dis_dispatching
)
}
}
}
}
,
// 设置全国选项不可选
selectEnable
(
row
)
{
if
(
row
.
a
.
length
&&
row
.
a
[
0
].
province_id
==
0
)
{
return
false
}
else
{
return
true
}
}
,
onClickInputKeyBoard
(
str
,
index
,
from
)
{
this
[
str
][
index
][
from
]
=
this
[
str
][
index
][
from
].
toString
().
match
(
/^
\d
*
(\.?\d
{0,2
}
)
/g
)[
0
]
}
,
onClickInputKeyBoard2
(
str
,
index
,
from
)
{
this
[
str
][
index
][
from
]
=
this
[
str
][
index
][
from
].
toString
().
match
(
/^
\d
*/g
)[
0
]
}
,
onClickInputKeyBoard3
(
str
,
from
)
{
this
[
str
][
from
]
=
this
[
str
][
from
].
toString
().
match
(
/^
\d
*/g
)[
0
]
}
,
closeDialog
()
{
this
.
$emit
(
'closeIndexbtn'
,
false
)
}
,
// 多选数据
handleSelectionChange
(
val
)
{
this
.
multipleSelection
=
val
;
}
,
// 添加配送地区
addDelivery
()
{
this
.
selectAddress
=
[]
this
.
addType
=
1
this
.
deliveryTableData
.
push
(
{
a
:
[],
f
:
''
,
fp
:
''
,
n
:
''
,
np
:
''
,
}
)
}
,
// 处理已经添加的数据不可重复添加
async
repeatAdd
()
{
await
this
.
cancelDisabled
()
let
arr
=
[]
// 已添加的数据合并到一个数组中
this
.
deliveryTableData
.
map
(
item
=>
{
arr
=
arr
.
concat
(
item
.
a
)
}
)
if
(
arr
.
length
)
{
for
(
let
i
=
0
;
i
<
arr
.
length
;
i
++
)
{
for
(
let
j
=
0
;
j
<
this
.
addressOptions
.
length
;
j
++
)
{
if
(
arr
[
i
].
city_id
)
{
if
(
arr
[
i
].
province_id
==
this
.
addressOptions
[
j
].
id
)
{
for
(
let
k
=
0
;
k
<
this
.
addressOptions
[
j
].
children
.
length
;
k
++
)
{
if
(
arr
[
i
].
city_id
==
this
.
addressOptions
[
j
].
children
[
k
].
id
)
{
this
.
$set
(
this
.
addressOptions
[
j
].
children
[
k
],
'disabled'
,
true
)
}
}
}
}
else
{
if
(
arr
[
i
].
province_id
==
this
.
addressOptions
[
j
].
id
)
{
this
.
$set
(
this
.
addressOptions
[
j
],
'disabled'
,
true
)
}
}
}
}
}
}
,
// 编辑时取消禁用的按钮
cancelDisabled
()
{
for
(
let
i
=
0
;
i
<
this
.
addressOptions
.
length
;
i
++
)
{
if
(
this
.
addressOptions
[
i
].
disabled
)
{
this
.
$set
(
this
.
addressOptions
[
i
],
'disabled'
,
false
)
}
for
(
let
j
=
0
;
j
<
this
.
addressOptions
[
i
].
children
.
length
;
j
++
)
{
if
(
this
.
addressOptions
[
i
].
children
[
j
].
disabled
)
{
this
.
$set
(
this
.
addressOptions
[
i
].
children
[
j
],
'disabled'
,
false
)
}
}
}
}
,
// 添加不配送地区
addNoDelivery
()
{
this
.
cancelDisabled
()
this
.
selectAddress
=
[]
this
.
addType
=
2
this
.
dialogAddress
=
true
}
,
// 删除配送地区
delDelivery
(
type
,
index
)
{
if
(
type
==
1
)
{
this
.
deliveryTableData
.
splice
(
index
,
1
);
}
else
{
for
(
let
i
=
0
,
len
=
this
.
multipleSelection
.
length
;
i
<
len
;
i
++
)
{
for
(
let
j
=
0
,
len
=
this
.
deliveryTableData
.
length
;
j
<
len
;
j
++
)
{
if
(
this
.
multipleSelection
[
i
]
==
this
.
deliveryTableData
[
j
])
{
this
.
deliveryTableData
.
splice
(
j
,
1
);
}
}
}
}
}
,
// 修改地区
async
editAddress
(
row
,
index
,
type
)
{
// type 2 限制配送区域 1 配送区域
this
.
selectAddress
=
[]
if
(
type
==
2
)
{
this
.
rowItem2
=
row
this
.
addType
=
2
this
.
cancelDisabled
()
}
else
{
this
.
rowItem
=
row
this
.
addType
=
1
await
this
.
repeatAdd
()
// 修改时取消当前行的禁用
let
arr
=
row
.
a
if
(
arr
.
length
)
{
for
(
let
i
=
0
;
i
<
arr
.
length
;
i
++
)
{
for
(
let
j
=
0
;
j
<
this
.
addressOptions
.
length
;
j
++
)
{
if
(
arr
[
i
].
city_id
)
{
if
(
arr
[
i
].
province_id
==
this
.
addressOptions
[
j
].
id
)
{
for
(
let
k
=
0
;
k
<
this
.
addressOptions
[
j
].
children
.
length
;
k
++
)
{
if
(
arr
[
i
].
city_id
==
this
.
addressOptions
[
j
].
children
[
k
].
id
)
{
this
.
$set
(
this
.
addressOptions
[
j
].
children
[
k
],
'disabled'
,
false
)
}
}
}
}
else
{
if
(
arr
[
i
].
province_id
==
this
.
addressOptions
[
j
].
id
)
{
this
.
$set
(
this
.
addressOptions
[
j
],
'disabled'
,
false
)
}
}
}
}
}
// 子元素全部禁用后父级也禁用
for
(
let
i
=
0
;
i
<
this
.
addressOptions
.
length
;
i
++
)
{
if
(
!
this
.
addressOptions
[
i
].
disabled
)
{
let
isDisabled
=
true
for
(
let
j
=
0
;
j
<
this
.
addressOptions
[
i
].
children
.
length
;
j
++
)
{
if
(
!
this
.
addressOptions
[
i
].
children
[
j
].
disabled
)
{
isDisabled
=
false
}
}
this
.
$set
(
this
.
addressOptions
[
i
],
'disabled'
,
isDisabled
)
}
}
}
// 添加时 已添加的不可重复添加
if
(
type
==
'add'
)
{
this
.
repeatAdd
()
}
this
.
selectAddress
=
row
.
id
this
.
dialogAddress
=
true
}
,
// 选择的地区赋值
saveAddress
()
{
let
a
=
[]
let
b
=
[]
let
c
=
[]
// 将每个省的数据组合到一个数组中
for
(
let
i
=
0
;
i
<
this
.
selectAddress
.
length
;
i
++
)
{
a
.
push
(
this
.
selectAddress
[
i
][
0
])
}
b
=
Array
.
from
(
new
Set
(
a
))
if
(
b
.
length
==
this
.
addressOptions
.
length
)
{
this
.
$message
.
warning
(
'已存在全国默认运费'
)
return
}
if
(
this
.
addType
==
1
)
{
this
.
rowItem
.
a
=
this
.
getAfferentData
()
this
.
rowItem
.
value
=
[]
this
.
rowItem
.
id
=
[]
this
.
rowItem
.
value
=
this
.
getSelectData
(
this
.
rowItem
.
a
)
this
.
rowItem
.
id
=
this
.
getBackData
(
this
.
rowItem
.
a
)
}
else
{
this
.
noDeliveryTableData
=
[]
this
.
noDeliveryTableData
.
push
({
a
:
this
.
getAfferentData
(
this
.
getAfferentData
()),
value
:
this
.
getSelectData
(
this
.
getAfferentData
()),
id
:
this
.
getBackData
(
this
.
getAfferentData
())
}
)
}
this
.
dialogAddress
=
false
}
,
// 获取对应数据显示的地址名称
getSelectData
(
data
)
{
let
a
=
[]
let
b
=
[]
let
c
=
[]
// 地址名称 省 市
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
a
.
push
(
data
[
i
].
province_id
)
}
b
=
Array
.
from
(
new
Set
(
a
))
for
(
let
i
=
0
;
i
<
b
.
length
;
i
++
)
{
let
name
=
''
let
arr
=
[]
for
(
let
j
=
0
;
j
<
data
.
length
;
j
++
)
{
if
(
b
[
i
]
==
data
[
j
].
province_id
)
{
if
(
data
[
j
].
city_id
)
{
name
=
data
[
j
].
province_name
arr
.
push
(
data
[
j
].
city_name
)
}
else
{
name
=
data
[
j
].
province_name
}
}
}
c
.
push
({
province_name
:
name
,
city_name
:
arr
}
)
}
return
c
}
,
// 将后台返回的格式处理成组件需要的格式
getBackData
(
data
)
{
let
arr
=
[]
for
(
let
i
=
0
;
i
<
data
.
length
;
i
++
)
{
let
arrItem
=
[]
if
(
data
[
i
].
city_id
)
{
arrItem
.
push
(
data
[
i
].
province_id
)
arrItem
.
push
(
data
[
i
].
city_id
)
arr
.
push
(
arrItem
)
}
else
{
for
(
let
j
=
0
;
j
<
this
.
addressOptions
.
length
;
j
++
)
{
if
(
data
[
i
].
province_id
==
this
.
addressOptions
[
j
].
id
)
{
for
(
let
k
=
0
;
k
<
this
.
addressOptions
[
j
].
children
.
length
;
k
++
)
{
arrItem
.
push
(
data
[
i
].
province_id
)
arrItem
.
push
(
this
.
addressOptions
[
j
].
children
[
k
].
id
)
arr
.
push
(
arrItem
)
arrItem
=
[]
}
}
}
}
}
return
arr
}
,
// 组装成后台需要的格式 省市
getAfferentData
()
{
let
a
=
[]
let
b
=
[]
let
c
=
[]
// 将每个省的数据组合到一个数组中
for
(
let
i
=
0
;
i
<
this
.
selectAddress
.
length
;
i
++
)
{
a
.
push
(
this
.
selectAddress
[
i
][
0
])
}
b
=
Array
.
from
(
new
Set
(
a
))
for
(
let
i
=
0
;
i
<
b
.
length
;
i
++
)
{
c
[
i
]
=
[]
for
(
let
j
=
0
;
j
<
this
.
selectAddress
.
length
;
j
++
)
{
if
(
b
[
i
]
==
this
.
selectAddress
[
j
][
0
])
{
c
[
i
].
push
(
this
.
selectAddress
[
j
])
}
}
}
let
selectData
=
[]
for
(
let
i
=
0
;
i
<
c
.
length
;
i
++
)
{
let
arr1
=
[]
for
(
let
j
=
0
;
j
<
this
.
addressOptions
.
length
;
j
++
)
{
if
(
c
[
i
][
0
][
0
]
==
this
.
addressOptions
[
j
].
id
)
{
let
d
=
[]
let
e
=
[]
c
[
i
].
map
(
item
=>
{
d
.
push
(
item
[
1
])
}
)
e
=
Array
.
from
(
new
Set
(
d
))
if
(
e
.
length
==
this
.
addressOptions
[
j
].
children
.
length
)
{
arr1
.
push
({
province_id
:
this
.
addressOptions
[
j
].
id
,
province_name
:
this
.
addressOptions
[
j
].
name
}
)
}
else
{
for
(
let
k
=
0
;
k
<
e
.
length
;
k
++
)
{
for
(
let
l
=
0
;
l
<
this
.
addressOptions
[
j
].
children
.
length
;
l
++
)
{
if
(
e
[
k
]
==
this
.
addressOptions
[
j
].
children
[
l
].
id
)
{
arr1
.
push
({
province_id
:
this
.
addressOptions
[
j
].
id
,
province_name
:
this
.
addressOptions
[
j
].
name
,
city_id
:
this
.
addressOptions
[
j
].
children
[
l
].
id
,
city_name
:
this
.
addressOptions
[
j
].
children
[
l
].
name
}
)
}
}
}
}
}
}
selectData
=
selectData
.
concat
(
arr1
)
}
return
selectData
}
,
// 将数据组合成省市县及是否选中的是全部地区 山东省【济南市(市中区,天桥区,长清区,济阳县)】 河北省(全部地区)
// getAddressName()
{
// let a = []
// let b = []
// let c = [] // 将每个省的数据组合到一个数组中
// for(let i = 0; i < this.selectAddress.length; i++)
{
// a.push(this.selectAddress[i][0])
//
}
// b = Array.from(new Set(a))
// for(let i = 0; i < b.length; i++)
{
// c[i] = []
// for(let j = 0; j < this.selectAddress.length; j++)
{
// if (b[i] == this.selectAddress[j][0])
{
// c[i].push(this.selectAddress[j])
//
}
//
}
//
}
// let addressName = []
// for(let i = 0; i < c.length; i++)
{
// let name1 = []
// let name2 = []
// let name3 = []
// let str = ''
// for(let j = 0; j < this.addressOptions.length; j++)
{
// if (c[i][0][0] == this.addressOptions[j].id)
{
// name1.push(this.addressOptions[j].name)
// let d = []
// let e = []
// c[i].map(item =>
{
// d.push(item[1])
//
}
)
// e = Array.from(new Set(d))
// if (e.length == this.addressOptions[j].children.length)
{
// name2.push('全部地区')
//
}
else
{
// if ('children' in this.addressOptions[j])
{
// for(let k = 0; k < e.length; k++)
{
// let data = ''
// let h = []
// for(let p = 0; p < d.length; p++)
{
// if (e[k] == d[p])
{
// h.push(d[p])
//
}
//
}
// for(let l = 0; l < this.addressOptions[j].children.length; l++)
{
// if (e[k] == this.addressOptions[j].children[l].id)
{
// data += (this.addressOptions[j].children[l].name)
// let f = []
// let g = []
// c[i].map(item =>
{
// if (e[k] == item[1])
{
// g.push(item[2])
//
}
//
}
)
// if ('children' in this.addressOptions[j].children[l])
{
// if (h.length == this.addressOptions[j].children[l].children.length)
{
// name3.push('全部地区')
//
}
else
{
// for(let m = 0; m < g.length; m++)
{
// for(let n = 0; n < this.addressOptions[j].children[l].children.length; n++)
{
// if (g[m] == this.addressOptions[j].children[l].children[n].id)
{
// name3.push(this.addressOptions[j].children[l].children[n].name)
//
}
//
}
//
}
//
}
//
}
//
}
//
}
// data += `($
{
name3
.
join
()
}
)
`
// name2.push(data)
// data = []
// name3 = []
//
}
//
}
//
}
//
}
//
}
// str = name1.join() + `
【
$
{
name2
.
join
()
}】
`
// addressName.push(str)
// name2 = []
// name3 = []
//
}
// return addressName
//
}
,
// 提交
handleSubmit() {
// 校验配送区域不能为空
let isContinue = true
if (this.deliveryTableData.length) {
for(let i = 0; i < this.deliveryTableData.length; i++) {
if (!this.deliveryTableData[i].a.length || !this.deliveryTableData[i].f || !this.deliveryTableData[i].fp || !this.deliveryTableData[i].n || !this.deliveryTableData[i].np) {
isContinue = false
}
}
}
this.$refs['ruleForm'].validate((valid) => {
if (valid) {
if (!isContinue) {
this.$message.warning('配送区域不能为空')
return
}
if (this.option.id == 0) {
let params = JSON.parse(JSON.stringify(Object.assign({
}
, this.ruleForm, {new_dispatching: this.deliveryTableData
}
)))
if (params.new_dispatching.length) {
params.new_dispatching.forEach(item=>{
item.fp = Number(item.fp * 100)
item.np = Number(item.np * 100)
item.value = undefined
item.id = undefined
}
)
}
params.new_dis_dispatching = this.noDeliveryTableData.length ? this.noDeliveryTableData[0].a : []
if (params.new_dis_dispatching.length) {
this.noDeliveryTableData[0].value = undefined
this.noDeliveryTableData[0].id = undefined
}
addFreight(params).then(res => {
if (res.code == 1) {
this.$message.success('新增成功')
this.closeDialog()
}
}
)
}
else {
let params = JSON.parse(JSON.stringify(Object.assign({
}
, this.ruleForm, {new_dispatching: this.deliveryTableData
}
)))
if (params.new_dispatching.length) {
params.new_dispatching.forEach(item=>{
item.fp = Number(item.fp * 100)
item.np = Number(item.np * 100)
item.value = undefined
item.id = undefined
}
)
}
params.new_dis_dispatching = this.noDeliveryTableData.length ? this.noDeliveryTableData[0].a : []
if (params.new_dis_dispatching.length) {
this.noDeliveryTableData[0].value = undefined
this.noDeliveryTableData[0].id = undefined
}
updateFreight(params).then(res => {
if (res.code == 1) {
this.$message.success('修改成功')
this.closeDialog()
}
}
)
}
}
}
)
}
}
}
</script>
<style scoped>
::v-deep .el-dialog__header {
background: #F5F7FA;
padding: 10px 20px !important;
border-bottom: 1px solid #DCDEE1;
margin-bottom: 0;
font-size: 16px;
}
.tipTitle {
font-size: 16px;
margin-top: 10px;
}
.tipContent {
font-size: 12px;
color: #515361;
}
::v-deep .multipleTable .el-table__header-wrapper th {
background: #fff;
}
.inputWidth ::v-deep .el-input__inner {
width: 100px;
}
::v-deep .el-cascader-menu__wrap {
height: 100%;
}
</style>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/views/system/goods/add/components/goodsimg.vue
浏览文件 @
973ad4fa
...
...
@@ -228,13 +228,13 @@
left
:
60px
;
}
/
deep
/
.ql-toolbar.ql-snow
{
::v-deep
.ql-toolbar.ql-snow
{
border
:
none
;
border-bottom
:
1px
solid
#ccc
;
padding
:
5px
8px
;
}
/
deep
/
.ql-toolbar.ql-snow
.ql-formats
{
::v-deep
.ql-toolbar.ql-snow
.ql-formats
{
vertical-align
:
baseline
;
margin
:
0
;
padding
:
0
8px
;
...
...
@@ -242,7 +242,7 @@
border-radius
:
3px
;
}
/
deep
/
.ql-toolbar.ql-snow
.ql-formats
:hover
{
::v-deep
.ql-toolbar.ql-snow
.ql-formats
:hover
{
background-color
:
#00afff
;
border-color
:
#00afff
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/goods/add/components/goodsinfomation.vue
浏览文件 @
973ad4fa
...
...
@@ -975,7 +975,7 @@
font-size
:
12px
;
}
/
deep
/
.el-form-item
{
::v-deep
.el-form-item
{
margin-bottom
:
20px
;
}
...
...
@@ -991,21 +991,21 @@
cursor
:
pointer
;
}
/*
/deep/
.el-cascader-menu {*/
/*
::v-deep
.el-cascader-menu {*/
/* height:600px;*/
/*}*/
/
deep
/
.el-cascader-menu
{
::v-deep
.el-cascader-menu
{
max-width
:
250px
!important
;
min-width
:
250px
!important
;
}
/
deep
/
.el-cascader-menu__wrap
{
::v-deep
.el-cascader-menu__wrap
{
width
:
auto
!important
;
max-width
:
250px
!important
;
min-width
:
250px
!important
;
}
.opendow
/
deep
/
.el-dialog
{
.opendow
::v-deep
.el-dialog
{
width
:
800px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/goods/add/components/goodsparameter.vue
浏览文件 @
973ad4fa
...
...
@@ -954,30 +954,30 @@ p {
.uploadData50
{
display
:
inline-block
;
/
deep
/
.el-upload--picture-card
{
::v-deep
.el-upload--picture-card
{
width
:
50px
;
height
:
50px
;
}
/
deep
/
.el-upload
{
::v-deep
.el-upload
{
width
:
50px
;
height
:
50px
;
line-height
:
50px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item
{
width
:
50px
;
height
:
50px
;
line-height
:
50px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
width
:
50px
;
height
:
50px
;
line-height
:
50px
;
}
/
deep
/
.avatar
{
::v-deep
.avatar
{
width
:
50px
;
height
:
50px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/goodsimport/components/goodsdetail.vue
浏览文件 @
973ad4fa
...
...
@@ -1114,12 +1114,12 @@
/* background-color: #fff; */
}
/
deep
/
.maxImgBox
{
::v-deep
.maxImgBox
{
width
:
455px
!important
;
height
:
455px
!important
;
}
/
deep
/
.el-input-group__append
{
::v-deep
.el-input-group__append
{
color
:
#fff
;
background-color
:
#647dff
;
border-color
:
#647dff
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/goodsimport/editgoods.vue
浏览文件 @
973ad4fa
...
...
@@ -36,7 +36,7 @@
.add-workorder-dialog
{
height
:
100%
;
}
/
deep
/
.add-workorder-dialog
el-dialog
{
::v-deep
.add-workorder-dialog
el-dialog
{
height
:
calc
(
100%
-
15vh
);
}
</
style
>
This diff is collapsed.
Click to expand it.
src/views/system/goodsimport/goodsgement.vue
浏览文件 @
973ad4fa
...
...
@@ -900,12 +900,12 @@
}
.
freightTemplate
-
add
{
/
deep
/
.
el
-
dialog
{
::
v
-
deep
.
el
-
dialog
{
height
:
80
%
;
overflow
:
hidden
;
}
/deep/
.
el
-
dialog__body
{
::
v
-
deep
.
el
-
dialog__body
{
height
:
calc
(
100
%
-
60
px
);
overflow
-
x
:
hidden
;
overflow
-
y
:
scroll
;
...
...
@@ -916,12 +916,12 @@
margin
:
0
10
px
;
}
/deep/
.
radiomodels
.
el
-
radio
-
button
.
el
-
radio
-
button__inner
{
::
v
-
deep
.
radiomodels
.
el
-
radio
-
button
.
el
-
radio
-
button__inner
{
border
:
1
px
solid
#
DCDFE6
!
important
;
border
-
radius
:
4
px
!
important
;
}
/deep/
.
radiomodels
.
el
-
radio
-
button
.
el
-
radio
-
button__orig
-
radio
:
checked
+
.
el
-
radio
-
button__inner
{
::
v
-
deep
.
radiomodels
.
el
-
radio
-
button
.
el
-
radio
-
button__orig
-
radio
:
checked
+
.
el
-
radio
-
button__inner
{
box
-
shadow
:
none
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/goodsimport/index.vue
浏览文件 @
973ad4fa
...
...
@@ -235,11 +235,11 @@ export default {
</
script
>
<
style
scoped
lang=
"scss"
type=
"text/stylus"
>
.freightTemplate-add
{
/
deep
/
.el-dialog
{
::v-deep
.el-dialog
{
height
:
80%
;
overflow
:
hidden
;
}
/
deep
/
.el-dialog__body
{
::v-deep
.el-dialog__body
{
height
:
calc
(
100%
-
60px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
...
...
@@ -248,11 +248,11 @@ export default {
.radiomodels
.el-radio-button
{
margin
:
0
10px
;
}
/
deep
/
.radiomodels
.el-radio-button
.el-radio-button__inner
{
::v-deep
.radiomodels
.el-radio-button
.el-radio-button__inner
{
border
:
1px
solid
#dcdfe6
!
important
;
border-radius
:
4px
!
important
;
}
/
deep
/
::v-deep
.radiomodels
.el-radio-button
.el-radio-button__orig-radio
:checked
...
...
@@ -275,7 +275,7 @@ export default {
padding
:
0
;
margin
:
5px
0
;
}
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
40px
);
overflow-y
:
auto
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/operation/document.vue
浏览文件 @
973ad4fa
...
...
@@ -144,10 +144,10 @@
</
script
>
<
style
lang=
"scss"
type=
"text/stylus"
scoped
>
/
deep
/
.el-card__header
p
{
::v-deep
.el-card__header
p
{
font-size
:
18px
;
}
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
padding
:
10px
0
10px
0
;
height
:
calc
(
100%
-
45px
);
overflow
:hidden
;
...
...
@@ -193,13 +193,13 @@
}
}
/*样式重置*/
/
deep
/
.el-submenu__title
{
::v-deep
.el-submenu__title
{
//padding: 0 30px!important;
}
/
deep
/
.el-submenu__title
>
span
{
::v-deep
.el-submenu__title
>
span
{
font-size
:
16px
;
}
/
deep
/
.el-table
td
{
::v-deep
.el-table
td
{
border
:
none
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/operation/helpDoc.vue
浏览文件 @
973ad4fa
...
...
@@ -139,7 +139,7 @@
</
script
>
<
style
lang=
"scss"
type=
"text/stylus"
scoped
>
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
100px
);
width
:
80%
;
padding
:
0
100px
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/order/components/orderDetail.vue
浏览文件 @
973ad4fa
...
...
@@ -837,34 +837,34 @@ export default {
</
script
>
<
style
scoped
>
/
deep
/
.el-dialog__header
{
::v-deep
.el-dialog__header
{
border-bottom
:
1px
solid
#eee
;
text-align
:
center
;
}
/
deep
/
.el-step__head.is-success
{
::v-deep
.el-step__head.is-success
{
color
:
#3AA0FF
;
border-color
:
#3AA0FF
;
}
/
deep
/
.el-step__title.is-success
{
::v-deep
.el-step__title.is-success
{
color
:
#3AA0FF
;
}
/
deep
/
.el-col
{
::v-deep
.el-col
{
border
:
1px
solid
#eee
;
padding
:
0
10px
;
height
:
38px
;
display
:
flex
;
align-items
:
center
;
}
/
deep
/
.el-dialog__body
{
::v-deep
.el-dialog__body
{
padding
:
20px
;
}
/
deep
/
.el-input--medium
.el-input__inner
{
::v-deep
.el-input--medium
.el-input__inner
{
height
:
28px
;
}
/*
/deep/
input::-webkit-input-placeholder{*/
/*
::v-deep
input::-webkit-input-placeholder{*/
/* color:#606266;*/
/*}*/
/*
/deep/
input::-moz-placeholder{*/
/*
::v-deep
input::-moz-placeholder{*/
/* color:#606266;*/
/* opacity: 1*/
/*}*/
...
...
@@ -938,18 +938,18 @@ export default {
.remark-con
.remark-text
{
}
/
deep
/
.only-eidt-placeholder
.el-input
input
::-webkit-input-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
::-webkit-input-placeholder
{
::v-deep
.only-eidt-placeholder
.el-input
input
::-webkit-input-placeholder
,
::v-deep
.only-eidt-placeholder
.el-input
textarea
::-webkit-input-placeholder
{
color
:
#666
;
}
/
deep
/
.only-eidt-placeholder
.el-input
input
:-moz-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
:-moz-placeholder
{
::v-deep
.only-eidt-placeholder
.el-input
input
:-moz-placeholder
,
::v-deep
.only-eidt-placeholder
.el-input
textarea
:-moz-placeholder
{
color
:
#666
;
opacity
:
1
;
}
/
deep
/
.only-eidt-placeholder
.el-input
input
::-moz-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
::-moz-placeholder
{
::v-deep
.only-eidt-placeholder
.el-input
input
::-moz-placeholder
,
::v-deep
.only-eidt-placeholder
.el-input
textarea
::-moz-placeholder
{
color
:
#666
;
opacity
:
1
;
}
/
deep
/
.only-eidt-placeholder
.el-input
input
:-ms-input-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
::-ms-input-placeholder
{
::v-deep
.only-eidt-placeholder
.el-input
input
:-ms-input-placeholder
,
::v-deep
.only-eidt-placeholder
.el-input
textarea
::-ms-input-placeholder
{
color
:
#666
;
}
</
style
>
This diff is collapsed.
Click to expand it.
src/views/system/order/index.vue
浏览文件 @
973ad4fa
...
...
@@ -1058,11 +1058,11 @@
.box-cardone
{
height
:
100%
;
}
/
deep
/
.el-range-editor.el-input__inner
{
::v-deep
.el-range-editor.el-input__inner
{
width
:
100%
;
}
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
50px
);
/* overflow: auto; */
}
...
...
@@ -1075,7 +1075,7 @@
/* height: calc(100% - 50px); */
/* overflow-y: hidden; */
}
/
deep
/
.el-tabs__header
{
::v-deep
.el-tabs__header
{
margin
:
0
;
}
.form-box
{
...
...
@@ -1087,7 +1087,7 @@
/*background-color: #F7F8FA;*/
}
/
deep
/
.form-params
.el-form-item
{
::v-deep
.form-params
.el-form-item
{
margin
:
5px
0
5px
0
;
}
.img-title-table
{
...
...
@@ -1136,7 +1136,7 @@
.order-card
{
margin
:
10px
0
12px
;
}
.order-card
/
deep
/
.el-card__header
{
.order-card
::v-deep
.el-card__header
{
padding
:
0
;
min-height
:
fit-content
;
}
...
...
@@ -1155,18 +1155,18 @@
margin
:
5px
0
;
}
/
deep
/
.title_table
{
::v-deep
.title_table
{
/*width: calc(100% - 94px) !important;*/
/*margin: 0 40px;*/
}
/
deep
/
.title_table
.el-table__body-wrapper
{
::v-deep
.title_table
.el-table__body-wrapper
{
display
:
none
!important
;
height
:
0
!important
;
}
/
deep
/
.title_table
tr
th
{
::v-deep
.title_table
tr
th
{
border-bottom
:
0
!important
;
}
/
deep
/
.title_table
::before
{
::v-deep
.title_table
::before
{
height
:
0
;
}
...
...
@@ -1194,12 +1194,12 @@
overflow
:
hidden
;
}
.delivery-fail-data-dialog
/
deep
/
.el-dialog
{
.delivery-fail-data-dialog
::v-deep
.el-dialog
{
height
:
80%
;
overflow
:
hidden
;
}
.delivery-fail-data-dialog
/
deep
/
.el-dialog
.el-dialog__body
{
.delivery-fail-data-dialog
::v-deep
.el-dialog
.el-dialog__body
{
height
:
calc
(
100%
-
120px
);
overflow
:
auto
;
padding
:
15px
20px
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/order/index2.vue
浏览文件 @
973ad4fa
...
...
@@ -951,18 +951,18 @@
</
script
>
<
style
scoped
lang=
"scss"
type=
"text/stylus"
>
.order-details
{
/
deep
/
.el-dialog
{
::v-deep
.el-dialog
{
height
:
80%
;
overflow
:
hidden
;
}
/
deep
/
.el-dialog__body
{
::v-deep
.el-dialog__body
{
height
:
calc
(
100%
-
120px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
}
}
/
deep
/
.queryFormInline
{
::v-deep
.queryFormInline
{
.el-form-item
:nth-child
(
1
)
{
margin-bottom
:
10px
;
}
...
...
@@ -988,7 +988,7 @@
.delivery-tips-con
{
font-size
:
12px
;
}
/
deep
/
.el-step__title.is-finish
{
::v-deep
.el-step__title.is-finish
{
color
:
#333
}
</
style
>
This diff is collapsed.
Click to expand it.
src/views/system/retreat/edit.vue
浏览文件 @
973ad4fa
...
...
@@ -887,7 +887,7 @@
}
/* 售后信息 表格 样式 */
/
deep
/
.el-col
{
::v-deep
.el-col
{
/*border: 1px solid #eee;*/
/*padding: 0 10px;*/
/*height: 38px;*/
...
...
This diff is collapsed.
Click to expand it.
src/views/system/retreat/retreat/index.vue
浏览文件 @
973ad4fa
...
...
@@ -506,22 +506,22 @@
height
:
100%
;
/*overflow: auto;*/
}
.card-spe-con
/
deep
/
.el-card__body
{
.card-spe-con
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
40px
);
overflow
:
hidden
;
}
/*
/deep/
.el-dialog__body {*/
/*
::v-deep
.el-dialog__body {*/
/* height: 100%;*/
/* overflow: hidden;*/
/*}*/
/
deep
/
.el-tabs__header
{
::v-deep
.el-tabs__header
{
margin
:
0
;
}
/
deep
/
.after-sale-tabs
.el-tabs__item
{
::v-deep
.after-sale-tabs
.el-tabs__item
{
line-height
:
30px
;
}
/
deep
/
.el-form--inline
.el-form-item
{
::v-deep
.el-form--inline
.el-form-item
{
margin-right
:
15px
;
}
...
...
@@ -541,7 +541,7 @@
margin
:
10px
0
12px
;
}
.order-card
/
deep
/
.el-card__header
{
.order-card
::v-deep
.el-card__header
{
padding
:
0
;
min-height
:
fit-content
;
}
...
...
@@ -560,16 +560,16 @@
margin
:
5px
0
;
}
/
deep
/
.title_table
.el-table__body-wrapper
{
::v-deep
.title_table
.el-table__body-wrapper
{
display
:
none
!important
;
height
:
0
!important
;
}
/
deep
/
.title_table
tr
th
{
::v-deep
.title_table
tr
th
{
border-bottom
:
0
!important
;
}
/
deep
/
.title_table
::before
{
::v-deep
.title_table
::before
{
height
:
0
;
}
...
...
@@ -593,12 +593,12 @@
overflow
:
hidden
;
}
.after-sale-dialog
/
deep
/
.el-dialog
{
.after-sale-dialog
::v-deep
.el-dialog
{
overflow
:
hidden
;
height
:
100%
;
}
.after-sale-dialog
/
deep
/
.el-dialog__body
{
.after-sale-dialog
::v-deep
.el-dialog__body
{
overflow
:
auto
;
height
:
calc
(
100%
-
120px
);
padding
:
10px
20px
;
...
...
This diff is collapsed.
Click to expand it.
src/views/system/retreat/retreat/index0907.vue
浏览文件 @
973ad4fa
...
...
@@ -762,16 +762,16 @@ import {dateFormat} from '@/utils'
};
</
script
>
<
style
scoped
lang=
"scss"
type=
"text/stylus"
>
/
deep
/
.queryFormInline
{
::v-deep
.queryFormInline
{
.el-form-item
{
margin-bottom
:
5px
;
}
}
/
deep
/
.after-sales-details
.el-dialog
{
::v-deep
.after-sales-details
.el-dialog
{
height
:
80%
;
overflow
:
hidden
;
}
/
deep
/
.el-dialog__body
{
::v-deep
.el-dialog__body
{
height
:calc
(
100
%
-
50px
)
;
overflow-y
:
scroll
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/retreat/retreat/index_bak.vue
浏览文件 @
973ad4fa
...
...
@@ -806,7 +806,7 @@ import {dateFormat} from '@/utils'
};
</
script
>
<
style
scoped
lang=
"scss"
type=
"text/stylus"
>
/
deep
/
.queryFormInline
{
::v-deep
.queryFormInline
{
.el-form-item
{
margin-bottom
:
5px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/settings/setpsd.vue
浏览文件 @
973ad4fa
...
...
@@ -468,7 +468,7 @@
width
:
90%
;
margin
:
40px
0
30px
100px
;
/
deep
/
.el-form-item
{
::v-deep
.el-form-item
{
margin-top
:
18px
!
important
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/shop/brand.vue
浏览文件 @
973ad4fa
...
...
@@ -1048,11 +1048,11 @@
</
style
>
<
style
lang=
"scss"
type=
"text/stylus"
scoped
>
.brandInf-add
{
/
deep
/
.el-dialog
{
::v-deep
.el-dialog
{
height
:
85%
;
overflow
:
hidden
;
}
/
deep
/
.el-dialog__body
{
::v-deep
.el-dialog__body
{
height
:
calc
(
100%
-
60px
);
overflow-x
:
hidden
;
overflow-y
:
scroll
;
...
...
@@ -1089,7 +1089,7 @@
padding
:
0
10px
;
}
.btnCen
{
/
deep
/
.el-form-item__content
{
::v-deep
.el-form-item__content
{
margin-left
:
0
!
important
;
text-align
:
center
;
margin-top
:
30px
;
...
...
@@ -1118,30 +1118,30 @@
// 上传图片样式重置 start
.uploadData
{
display
:
inline-block
;
/
deep
/
.el-upload--picture-card
{
::v-deep
.el-upload--picture-card
{
width
:
100px
;
height
:
100px
;
}
/
deep
/
.el-upload
{
::v-deep
.el-upload
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.avatar
{
::v-deep
.avatar
{
width
:
100px
;
height
:
100px
;
}
...
...
This diff is collapsed.
Click to expand it.
src/views/system/shop/index.vue
浏览文件 @
973ad4fa
...
...
@@ -950,11 +950,11 @@
<
style
lang=
"scss"
type=
"text/stylus"
scoped
>
.shopinf-edit
{
//
/deep/
.el-dialog {
//
::v-deep
.el-dialog {
// height: 80%;
// overflow : hidden;
//}
//
/deep/
.el-dialog__body{
//
::v-deep
.el-dialog__body{
// height: calc(100% - 60px);
// overflow-x: hidden;
// overflow-y: scroll;
...
...
@@ -982,20 +982,20 @@
}
/
deep
/
.el-card__body
{
::v-deep
.el-card__body
{
height
:
calc
(
100%
-
80px
);
margin
:
10px
0
;
overflow-x
:
hidden
;
overflow-y
:
scroll
;
}
/
deep
/
.speDom
{
::v-deep
.speDom
{
color
:
red
;
font-size
:
20px
;
margin
:
0
0
4px
10px
;
}
/
deep
/
.speTip
{
::v-deep
.speTip
{
color
:
#c0ccda
;
font-size
:
14px
;
}
...
...
@@ -1017,30 +1017,30 @@
.uploadData
{
display
:
inline-block
;
/
deep
/
.el-upload--picture-card
{
::v-deep
.el-upload--picture-card
{
width
:
100px
;
height
:
100px
;
}
/
deep
/
.el-upload
{
::v-deep
.el-upload
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
::v-deep
.el-upload-list--picture-card
.el-upload-list__item-thumbnail
{
width
:
100px
;
height
:
100px
;
line-height
:
100px
;
}
/
deep
/
.avatar
{
::v-deep
.avatar
{
width
:
100px
;
height
:
100px
;
}
...
...
@@ -1171,7 +1171,7 @@
// 提示语样式 end
.btnCen
{
/
deep
/
.el-form-item__content
{
::v-deep
.el-form-item__content
{
margin-left
:
0
!
important
;
text-align
:
center
;
//margin-top: 30px;
...
...
This diff is collapsed.
Click to expand it.
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论