Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
Overview
Overview
Details
Activity
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
marketing-web
marketing
Commits
e6e661cc
Commit
e6e661cc
authored
Aug 30, 2022
by
caoyanzhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 修复bug
parent
019e5b00
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
form.js
src/views/card/form.js
+1
-1
form.vue
src/views/card/form.vue
+1
-1
record-get.vue
src/views/card/record-get.vue
+1
-1
No files found.
src/views/card/form.js
View file @
e6e661cc
...
...
@@ -502,7 +502,7 @@ export default {
this
.
importCost
.
costStoreList
=
costStoreList
;
this
.
$message
.
success
(
`上传
${
importCount
}
条数据,
${
importSuccessCount
}
条数据上传成功`
);
if
(
importCount
-
importSuccessCount
>
0
)
{
this
.
importCost
.
options
.
downloadTemplate
.
push
(
{
this
.
importCost
.
options
.
downloadTemplate
.
splice
(
1
,
1
,
{
url
:
`/api-marketing/download-cost-store-error?requestProject=marketing&importId=
${
importId
}
`
,
name
:
'下载错误数据'
});
...
...
src/views/card/form.vue
View file @
e6e661cc
...
...
@@ -97,7 +97,7 @@
<i
class=
"iconfont icon-QuestionCircleOutlined"
></i>
</el-tooltip>
</div>
<dm-store-selector
:uuid
.
sync=
"storeUuid"
:options=
"[5]"
:store-type-disabled=
"form.costValueType == 0"
@
optionsChange=
"onOptionsChange"
@
store-change=
"onStoreChange"
></dm-store-selector>
<dm-store-selector
:uuid
.
sync=
"storeUuid"
:options=
"[5]"
:store-type-disabled=
"
isEdit &&
form.costValueType == 0"
@
optionsChange=
"onOptionsChange"
@
store-change=
"onStoreChange"
></dm-store-selector>
<div
v-if=
"form.costValueProportionFlag == 1"
class=
"cost-box"
>
<div
v-if=
"form.costValueType == 0"
class=
"fixed-cost"
>
<el-form-item
label=
"成本比例"
prop=
"costValueProportion"
label-width=
"85px"
><el-input-number
v-model=
"form.costValueProportion"
:disabled=
"isEdit || isInfo"
:min=
"0"
:max=
"100"
:precision=
"0"
:controls=
"false"
style=
"margin-right: 10px; width: 130px"
placeholder=
"请输入成本比例"
></el-input-number>
%
</el-form-item>
...
...
src/views/card/record-get.vue
View file @
e6e661cc
...
...
@@ -57,7 +57,7 @@
<template
v-if=
"scope.row.gicCouponType === 1"
>
e袋洗
</
template
>
<
template
v-else
>
{{
scope
.
row
.
cardType
===
0
?
'抵金券'
:
scope
.
row
.
cardType
===
1
?
'折扣券'
:
'兑换券
'
}}
</
template
>
<
template
v-else
>
{{
scope
.
row
.
cardType
===
0
?
'抵金券'
:
scope
.
row
.
cardType
===
1
?
'折扣券'
:
scope
.
row
.
cardType
==
2
?
'兑换券'
:
scope
.
row
.
cardType
==
3
?
'商场抵金券'
:
'--
'
}}
</
template
>
</template>
</el-table-column>
<el-table-column
min-width=
"100"
align=
"left"
prop=
"receiveTime"
label=
"卡券名称"
>
...
...
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