Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
d6958b42
Commit
d6958b42
authored
Dec 07, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复几个bug
parent
9bc7a3f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
edit.vue
src/views/ecw/coupon/edit.vue
+4
-2
index.vue
src/views/ecw/order/index.vue
+2
-3
index.vue
src/views/ecw/productPrice/index.vue
+2
-2
No files found.
src/views/ecw/coupon/edit.vue
View file @
d6958b42
...
...
@@ -158,6 +158,7 @@
v-model=
"form.isSimilarSuperposition"
formatter=
"bool"
:placeholder=
"$t('请选择类型')"
defaultable
/>
</el-form-item>
...
...
@@ -182,7 +183,7 @@
v-if=
"form.type != 1"
>
<!---第一个不是全部,所以不能使用defaultable-->
<dict-selector
:type=
"DICT_TYPE.ECW_SUITABLE_LINE_TYPE"
v-model=
"form.suitableLineType"
formatter=
"number"
/>
<dict-selector
:type=
"DICT_TYPE.ECW_SUITABLE_LINE_TYPE"
v-model=
"form.suitableLineType"
formatter=
"number"
defaultable
/>
<routers-selector
v-if=
"showRouterSelector"
v-model=
"form.lineIds"
style=
"margin-top:5px"
/>
</el-form-item>
<el-form-item
...
...
@@ -259,6 +260,7 @@ import RoutersSelector from '@/components/RoutersSelector'
import
ProductsSelector
from
'
@/components/ProductsSelector
'
import
Editor
from
'
@/components/Editor
'
import
Selector
from
'
@/components/Selector/index
'
import
{
parseTime
}
from
'
@/utils/ruoyi
'
export
default
{
...
...
@@ -593,7 +595,7 @@ export default {
let
data
=
Object
.
assign
({},
this
.
form
,
{
discountDetailedVOs
})
// 开始时间必填
if
(
!
data
.
startTime
)
data
.
startTime
=
'
2022-01-01 00:00:00
'
if
(
!
data
.
startTime
)
data
.
startTime
=
parseTime
(
Date
.
now
())
//
'2022-01-01 00:00:00'
// status必填
data
.
status
=
status
data
.
couponIds
=
this
.
couponIds
.
join
(
'
,
'
)
...
...
src/views/ecw/order/index.vue
View file @
d6958b42
...
...
@@ -146,15 +146,14 @@
<el-table-column
:label=
"$t('体积/重量')"
align=
"center"
prop=
"sumWeight"
>
<
template
slot-scope=
"{row}"
>
<!--入仓前是填单数据,入仓后是入仓数据-->
{{
row
.
orderType
==
2
}}
<el-tooltip
<component
:is=
"row.orderType == 2 ? 'el-tooltip' : 'div'"
class=
"item"
effect=
"dark"
:content=
"(row.wVolume||0)+'m³'"
placement=
"bottom"
>
<div
v-if=
"row.inWarehouseState
<
=
1
"
>
{{
row
.
costVO
.
totalVolume
}}
m³ /
{{
row
.
costVO
.
totalWeight
}}
Kg
</div>
<div
v-else
>
{{
row
.
sumVolume
}}
m³ /
{{
row
.
sumWeight
}}
Kg
</div>
</
el-tooltip
>
</
component
>
<!--
<el-tooltip
v-if=
"scope.row.orderExceptionType=='order_heavy_cargo_exception'"
class=
"item"
effect=
"dark"
:content=
"(scope.row.wvolume||0)+'m³'"
placement=
"bottom"
>
<span
style=
"color:#ff4949"
v-if=
"scope.row.orderStatus >= 5 "
>
{{
scope
.
row
.
volume
+
"
m³/
"
+
scope
.
row
.
weight
+
"
kg
"
}}
</span>
<span
style=
"color:#ff4949"
v-else
>
{{
scope
.
row
.
totalVolume
+
"
m³/
"
+
scope
.
row
.
totalWeight
+
"
kg
"
}}
</span>
...
...
src/views/ecw/productPrice/index.vue
View file @
d6958b42
...
...
@@ -48,7 +48,7 @@
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('
审核
状态')"
prop=
"auditStatus"
>
<el-form-item
:label=
"$t('
上架
状态')"
prop=
"auditStatus"
>
<dict-selector
:type=
"DICT_TYPE.ECW_PRICE_AUDIT_STATUS"
v-model=
"queryParams.auditStatus"
clearable
/>
</el-form-item>
<el-form-item
:label=
"$t('状态')"
prop=
"combStatus"
>
...
...
@@ -349,7 +349,7 @@ export default {
}
let
setPriceText
=
notSetPrice
?
'
(
'
+
this
.
$t
(
'
未设置价格
'
)
+
'
)
'
:
''
;
if
(
row
.
blacklist
)
return
this
.
$t
(
'
黑名单
'
)
+
setPriceText
;
if
(
row
.
auditStatus
===
AuditStatusEnum
.
PASS
)
return
this
.
$t
(
'
已
审核
'
)
+
setPriceText
;
if
(
row
.
auditStatus
===
AuditStatusEnum
.
PASS
)
return
this
.
$t
(
'
已
上架
'
)
+
setPriceText
;
return
this
.
$t
(
'
已下架
'
)
+
setPriceText
;
}
},
...
...
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