Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
welfare
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
达摩4.0重构
welfare
Commits
84fce6a1
Commit
84fce6a1
authored
Mar 10, 2021
by
shaojiawen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug:TAPD
券码的生成方式,导入券码,列表应该不展示调整库存的口子
parent
f124f422
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
adjust-stock.vue
src/components/libs/adjust-stock.vue
+1
-0
card-list.vue
src/views/card/gic-card/card-list.vue
+3
-2
No files found.
src/components/libs/adjust-stock.vue
View file @
84fce6a1
...
...
@@ -83,6 +83,7 @@ export default {
// return;
// }
const
params
=
{
remark
:
this
.
ruleForm
.
remark
,
optType
:
this
.
ruleForm
.
type
,
// 1: 增加; 2: 减少
count
:
this
.
ruleForm
.
stock
// 增加或者减少数量
};
...
...
src/views/card/gic-card/card-list.vue
View file @
84fce6a1
...
...
@@ -85,7 +85,7 @@
<el-table-column
prop=
"name"
label=
"卡券成本(元)"
min-width=
"130"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
cardType
==
0
||
scope
.
row
.
cardType
==
2
?
scope
.
row
.
costPrice
:
'--'
}}
</
template
>
</el-table-column>
<el-table-column
label=
"
卡券
库存"
min-width=
"180"
>
<el-table-column
label=
"
可占用
库存"
min-width=
"180"
>
<
template
slot=
"header"
>
<el-tooltip
placement=
"top"
open-delay=
"200"
><div
slot=
"content"
>
可占库存:福利可以被直接使用和被应用占用的数量;
<br/>
已占用:福利已经被应用通过”固定库存“方式占用的数量;
<br/>
总库存:福利实际未产生履约单,还可以被出库的数量;
</div>
<span
class=
"tooltip-icon"
>
可占用库存
</span>
...
...
@@ -100,7 +100,7 @@
<i
class=
"el-icon-question cursor fz12 gray-lighter"
slot=
"reference"
style=
"position:relative;"
></i>
</el-popover>
{{
scope
.
row
.
remainedStock
||
0
}}
<el-button
v-if=
"[1, 2].includes(scope.row._status)"
@
click=
"preAdjustStock(scope.row) && scope.row.customCodeFlag == 0"
class=
"hover-btn"
icon=
"el-icon-edit-outline ml5"
type=
"text"
></el-button>
<el-button
v-if=
"[1, 2].includes(scope.row._status)
&& scope.row.customCodeFlag == 0
"
@
click=
"preAdjustStock(scope.row) && scope.row.customCodeFlag == 0"
class=
"hover-btn"
icon=
"el-icon-edit-outline ml5"
type=
"text"
></el-button>
<el-button
v-if=
"[1, 2].includes(scope.row._status) && scope.row.customCodeFlag == 2"
class=
"hover-btn ml5"
@
click=
"uploadCode(scope.row)"
icon=
"iconfont-market4 icon-shangchuan"
type=
"text"
></el-button>
</
template
>
</el-table-column>
...
...
@@ -325,6 +325,7 @@ export default {
// 请求修改库存
adjustStockBack
(
params
)
{
this
.
$refs
.
adjust
.
loading
=
true
;
console
.
log
(
params
);
params
.
couponId
=
this
.
currentCard
.
couponId
;
updateCardStock
(
params
).
then
(
res
=>
{
this
.
$refs
.
adjust
.
close
();
...
...
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