Skip to content

W
welfare
Commit 122bcafc by chenxin
Options

fix: ui

parent df3d1c0e
Showing with 170 additions and 95 deletions
dist/css/card-package.6b1248ca.css 0 → 100644
.ml40[data-v-65a0d802]{margin-left:40px}.filter-block[data-v-65a0d802]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-65a0d802]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-65a0d802]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-65a0d802]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-65a0d802]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-08a9ee1a]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-08a9ee1a]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/card-package.81f361e7.css deleted 100644 → 0
.sort-btn[data-v-b4579bee]{width:14px}.sort-btn .el-icon-caret-top[data-v-b4579bee]{top:4px}.sort-btn .el-icon-caret-bottom[data-v-b4579bee]{top:-4px}.sort-btn i[data-v-b4579bee]{-webkit-transform:scale(.8);transform:scale(.8);font-size:12px;position:relative;color:#4a4a4a}.sort-btn i.active[data-v-b4579bee]{color:#2f54eb}.el-icon-delete[data-v-08a9ee1a]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-08a9ee1a]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/card-package~gic-card.3ecaae9d.css 0 → 100644
.prepend-select[data-v-f40ed020] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-f40ed020] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;border-bottom:1px solid #dcdfe6;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:0;left:0;width:60px;height:60px;border-radius:4px}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
dist/css/card-package~gic-card.a1fad8eb.css deleted 100644 → 0
.prepend-select[data-v-f40ed020] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-f40ed020] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;border:1px solid #dcdfe6;background:#fff}.welfare-item .head{font-size:13px;background:#ebecf0;color:#303133;height:40px;line-height:40px;padding:0 20px 0;border-bottom:1px solid #dcdfe6}.welfare-item .head label{color:#606266}.welfare-item .head-type{margin-right:20px;min-width:100px}.welfare-item .content{height:115px;overflow:hidden;padding:0;display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content>div{margin-left:20px;padding-top:20px;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:28px}
\ No newline at end of file
dist/css/gic-card.8ce78c81.css 0 → 100644
.upload[data-v-3fa9aee0]{display:inline-block;width:175px;line-height:15px!important}.file-list[data-v-3fa9aee0]{margin-left:95px}.file-list li[data-v-3fa9aee0]{height:37px;line-height:37px;background:#f2f3f7;border-radius:2px;margin-bottom:5px;padding-left:13px;padding-right:27px;margin-top:10px}.file-list li i[data-v-3fa9aee0]{margin-top:12px}.file-list li p[data-v-3fa9aee0]{display:inline-block;width:80%;margin-left:5px}.rule[data-v-3fa9aee0]{color:#909399;padding-top:22px;margin-top:36px;border-top:1px solid #e4e7ed;margin-bottom:11px}.rule+ul[data-v-3fa9aee0]{color:#909399}.rule+ul li[data-v-3fa9aee0]{font-size:12px;line-height:20px}.ct[data-v-1a4621fb]{padding-left:20px;padding-right:20px;position:relative}.ct i[data-v-1a4621fb]{position:absolute;left:0;top:3px}.ct p[data-v-1a4621fb]{font-size:13px;font-weight:400;color:#606266;line-height:22px}.ct .tips[data-v-1a4621fb]{font-size:13px;line-height:1;color:#606266;margin-left:90px;margin-top:8px}.ct .tips[data-v-1a4621fb]:before{content:"*";color:#ff943e;margin-right:3px}[data-v-7e518c54] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-7e518c54] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-7e518c54]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-7e518c54]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-7e518c54]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-7e518c54]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-7e518c54]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-7e518c54]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-7e518c54]{margin-left:40px}.filter-block[data-v-7e518c54]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-7e518c54]{margin-left:10px;margin-right:10px;line-height:20px}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.w260[data-v-b43f3084]{width:260px}.result[data-v-34452bfd]{text-align:center}.result p[data-v-34452bfd]:first-child{color:#303133;font-size:14px;line-height:24px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:24px}.result i[data-v-34452bfd]{font-size:24px;margin-right:8px}.send-preview[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease;opacity:0;visibility:hidden;z-index:1000;position:fixed;width:100%;height:100%;overflow-y:hidden;left:0;top:0}.send-preview.visible[data-v-0ab93ec9]{visibility:visible;opacity:1}.send-preview div.block[data-v-0ab93ec9]{margin:0 auto;z-index:3;position:relative;top:0;height:100%;width:100%}.send-preview div.block img[data-v-0ab93ec9]{width:100%}.send-preview ul[data-v-0ab93ec9]{position:absolute;bottom:10px}.send-preview .content[data-v-0ab93ec9]{height:100%;width:100%;position:absolute;left:0;top:0}.send-preview .content .avatar[data-v-0ab93ec9]{position:absolute;right:75.5px;top:119px}.send-preview .content .avatar[data-v-0ab93ec9] i{font-size:18px;line-height:35px}.send-preview .content .blk[data-v-0ab93ec9]{position:absolute;padding:22px 15px 13px 15px;right:129.5px;top:119px;width:224px;background:#fff;-webkit-box-shadow:0 2px 8px 0 rgba(0,0,0,.1);box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:10px}.send-preview .content .blk .card[data-v-0ab93ec9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.send-preview .content .blk .card i[data-v-0ab93ec9]{position:relative;top:2px}.send-preview .content .blk pre[data-v-0ab93ec9]{margin:15px auto;line-height:18px}.send-preview .bg[data-v-0ab93ec9]{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:block;background:rgba(0,0,0,.5)}.send-preview .btn[data-v-0ab93ec9]{position:absolute;height:80px;width:368px;top:773px;left:63px;background:#fff;overflow:hidden;border-radius:0 0 50px 50px}.send-preview .btn li[data-v-0ab93ec9]{float:left;width:50%;line-height:80px;color:#606266;text-align:center;font-size:18px}.send-preview .btn li.active[data-v-0ab93ec9]{color:#2f54eb}.page[data-v-0ab93ec9]{width:308px;position:absolute;top:98px;left:50%;margin-left:-154px}.page .title[data-v-0ab93ec9]{color:#335782;font-size:16px;margin:16px 0;text-align:center}.page .page-card[data-v-0ab93ec9]{background:#fff;padding:20px;height:650px;border-radius:4px}.page .give-rule[data-v-0ab93ec9]{margin-top:70px}.page .give-rule dd[data-v-0ab93ec9]{text-align:center;color:#2c3038;font-size:18px;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #e6e6e6}.page .give-rule dt[data-v-0ab93ec9]{font-size:14px;line-height:24px}.page .card-content[data-v-0ab93ec9]{-webkit-box-shadow:0 2px 8px 0 rgba(136,148,156,.15);box-shadow:0 2px 8px 0 rgba(136,148,156,.15);overflow:hidden;position:relative;height:70px;padding-left:91px;background:#fff}.page .card-content img.exchange[data-v-0ab93ec9]{width:50px}.page .card-content .dl[data-v-0ab93ec9]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:91px;color:#fff;height:100%;text-align:center;position:absolute;left:0;top:0;background:#3970b5}.page .card-content .dl[data-v-0ab93ec9]:after{content:"";width:6px;height:100%;background:url([object Module]) repeat-y;position:absolute;left:-3px;top:0}.page .card-content .dl p[data-v-0ab93ec9]{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:28px;font-weight:700;line-height:100px;height:100px;text-align:center}.page .card-content .dl p span[data-v-0ab93ec9]{margin-right:2px;font-size:18px}.page .card-d[data-v-0ab93ec9]{padding:10px 10px 5px 10px;position:relative;height:100%}.page .card-d-title[data-v-0ab93ec9]{height:18px;font-size:13px;font-weight:500;color:#2c3038;line-height:18px;margin-bottom:11px;position:relative;margin-top:2px;padding-left:48px}.page .card-d-title span[data-v-0ab93ec9]{position:absolute;left:-20px;bottom:-7px;width:84px;padding:2px 0 2px;border-radius:1px;text-align:center;color:#fff;line-height:28px;font-weight:400;font-size:20px;display:inline-block;-webkit-transform:scale(.5);transform:scale(.5)}.page .card-d-time[data-v-0ab93ec9]{height:15px;font-size:12px;font-weight:400;color:#2c3038;line-height:15px}.page .card-d-option[data-v-0ab93ec9]{width:calc(200% - 48px);position:absolute;bottom:0;left:-40%;font-size:22px;font-weight:400;color:#2c3038;line-height:32px;-webkit-transform:scale(.5);transform:scale(.5);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.page .card-d-option img[data-v-0ab93ec9]{width:24px;height:24px}.page .card-d-option .right[data-v-0ab93ec9]{margin-left:auto}.slide-fade-enter-active[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease}.slide-fade-leave-active[data-v-0ab93ec9]{-webkit-transition:all .8s cubic-bezier(1,.5,.8,1);transition:all .8s cubic-bezier(1,.5,.8,1)}.slide-fade-enter[data-v-0ab93ec9],.slide-fade-leave-to[data-v-0ab93ec9]{-webkit-transform:translateX(10px);transform:translateX(10px);opacity:0}.mt8[data-v-76a64d3b]{margin-top:8px}.cardForm[data-v-76a64d3b]{padding:30px 20px}.cardForm .w165[data-v-76a64d3b]{width:165px!important}.cardForm .w265[data-v-76a64d3b]{width:265px!important}.cardForm .tips[data-v-76a64d3b]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-76a64d3b]{margin:20px auto 48px}.cardForm[data-v-76a64d3b] .el-form .el-input-number .el-input,.cardForm[data-v-76a64d3b] .el-form .el-select .el-input{width:100%}.cardForm[data-v-76a64d3b] .el-form .w260,.w260[data-v-76a64d3b] input,.w260[data-v-76a64d3b] textarea{width:260px}.cardEffectiveMode1[data-v-76a64d3b]{position:relative}.cardEffectiveMode1-time[data-v-76a64d3b]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-76a64d3b]{top:47px}.content[data-v-76a64d3b]{margin-bottom:30px}.info .row[data-v-427ff922] .el-form-item{margin-bottom:12px}.w500[data-v-427ff922] input,.w500[data-v-427ff922] textarea{width:500px}.card-info[data-v-427ff922]{padding:24px 20px;position:relative}.card-info .title[data-v-427ff922]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-427ff922] .btn-area{display:none}.card-info[data-v-427ff922] .el-form-item__content{color:#303133}.card-info[data-v-427ff922] .el-form .el-input-number .el-input,.card-info[data-v-427ff922] .el-form .el-select .el-input{width:100%}.card-info[data-v-427ff922] .el-form .dm-input,.card-info[data-v-427ff922] .el-form .el-input,.card-info[data-v-427ff922] .el-form .el-input-number,.card-info[data-v-427ff922] .el-form .el-select,.card-info[data-v-427ff922] .el-form .el-textarea{width:352px}.cardSelect[data-v-1324332a] .el-button{width:350px!important}.cardSelect[data-v-1324332a] .reveal .card img.flag{display:none}[data-v-1324332a] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-1324332a] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/js/chunk-vendors.a6adec24.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.763b1309.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.793c061d.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/styles/general.scss
......@@ -415,6 +415,9 @@ a:hover {
.w250 {
width: 250px !important;
}
.w260 {
width: 260px !important;
}
.w280 {
width: 280px !important;
}
......
src/components/stock-list/index.vue
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<div class="clearfix flex-center">
<welfare-item :welfare-id="$route.query.id" :type="type" @updateSkulist="(list) => { skuList = list; }"></welfare-item>
</div>
<div style="height:20px;width:calc(100% + 40px);position:relative;left:-20px;" class="bg-color mb20"></div>
<div>
<p class="fz16 mb15">操作记录<span class="fz12 ml10 gray03">主要对手动调整库存，应用占用库存，应用释放库存的场景下对福利“可占库存”引起变更进行记录</span></p>
<div class="table-search-head">
<el-select class="mr10 w140" v-if="type == 1" clearable v-model="listParams.name" placeholder="全部SKU" @change="refresh">
<p class="fray01 fw500 mb15">操作记录<span class="fz12 ml15 gray03 fw400">主要对手动调整库存，应用占用库存，应用释放库存的场景下对福利“可占库存”引起变更进行记录</span></p>
<div class="mb20">
<el-select class="mr10 w160" v-if="type == 1" clearable v-model="listParams.name" placeholder="全部SKU" @change="refresh">
<el-option v-for="(item, idx) in skuList" :key="idx" :label="item.giftSkuName" :value="item.giftSkuId"></el-option>
</el-select>
<el-select class="mr10 w140" clearable v-model="listParams.modifyType" placeholder="全部操作类型" @change="refresh">
<el-select class="mr10 w160" clearable v-model="listParams.modifyType" placeholder="全部操作类型" @change="refresh">
<el-option v-for="item in stockAdjustType" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
<el-select v-model="appCodes" class="w140 mr10" multiple placeholder="全部来源" clearable @change="changeAppCode">
<el-select v-model="appCodes" class="w160 mr10" multiple placeholder="全部来源" clearable @change="changeAppCode">
<el-option v-for="item in appList" :key="item.appCode" :label="item.appName" :value="item.appCode"></el-option>
</el-select>
<el-input class="mr10 w300" v-model="listParams.activityName" clearable placeholder="请输入活动名称搜索" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-date-picker class="w300 mr10" v-model="dateTime" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-input class="mr10 w260" v-model="listParams.activityName" clearable placeholder="请输入活动名称搜索" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-date-picker class="w350 mr10" v-model="dateTime" type="daterange" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
</div>
</div>
<el-table tooltip-effect="dark" :data="tableList" style="width:100%">
......
src/components/stock-list/welfare-item.vue
<template>
<div class="welfare-item">
<div class="head">
<el-tag type="success" class="mr10">使用中</el-tag>
<label>更新时间：</label><span v-html="formatDateTimeByType(info.updateTime)"></span><label class="ml30">福利ID：</label>{{ welfareId }}
<el-tag effect="plain">{{ fUseStatus(info.useStatus) }}</el-tag>
<label>福利ID：</label><span>{{ welfareId }}</span>
<label>更新时间：</label><span v-html="formatDateTimeByType(info.updateTime)"></span>
<label>创建时间：</label><span v-html="formatDateTimeByType(info.createTime)"></span>
<span class="btn" @click="dialogVisible = true">活动记录<i class="el-icon-arrow-right ml5"></i></span>
</div>
<div class="content">
<div>
<p>{{ info.name || '--' }}</p>
<p class="gray03 fz12"><template v-if="type == 1 || type == 2">礼品编码：</template>{{ info.remarkName || '--' }}</p>
<p class="gray03 fz12">创建时间：<span v-html="formatDateTimeByType(info.createTime)"></span></p>
<div class="f1">
<div class="detail">
<p>{{ info.name || '--' }}</p>
<p class="gray03 fz12"><template v-if="type == 1 || type == 2">礼品编码：</template>{{ info.remarkName || '--' }}</p>
<img :src="info.imgUrl" draggable="false" />
</div>
<p>成本(元)<span>¥{{ info.costPrice || 0 }}</span></p>
<p>可占库存<span>{{ info.remainedStock || 0 }}</span></p>
</div>
<div>
<p>成本:¥{{ info.costPrice || 0 }}</p>
<p>可占库存：{{ info.remainedStock || 0 }}</p>
</div>
<div style="position:relative;">
<p>已占用：{{ info.occupyStock || 0 }}</p>
<p>总库存：{{ info.totalStock || 0 }}</p>
<p>已履约：{{ info.outStock || 0 }}</p>
<p v-if="type == 1 || type == 2">待履约：{{ info.reStock || 0 }}</p>
</div>
<div style="flex-shrink: 0;width:100px;">
<el-button type="primary" class="fr mr20" @click="dialogVisible = true">活动记录</el-button>
<div class="f2">
<el-row :gutter="10">
<el-col :span="12" class="mb20">已占用：<span>{{ info.occupyStock || 0 }}</span></el-col>
<el-col :span="12" class="mb20">总库存：<span>{{ info.totalStock || 0 }}</span></el-col>
<el-col :span="12">已履约：<span>{{ info.outStock || 0 }}</span></el-col>
<el-col :span="12" v-if="type == 1 || type == 2">待履约：<span>{{ info.reStock || 0 }}</span></el-col>
</el-row>
</div>
</div>
<!-- 实物礼品才有sku列表 -->
......@@ -78,8 +80,9 @@ export default {
if(this.type == 1 || this.type == 2) {
// 礼品
giftGet({ id: this.welfareId }).then(res => {
const { updateTime, createTime, giftName, giftNo, virCostPrice, outStock, preStock, occupyStock, remainedStock, totalStock } = res.result;
const { imgUrl, updateTime, createTime, giftName, giftNo, virCostPrice, outStock, preStock, occupyStock, remainedStock, totalStock, useStatus } = res.result;
this.info = {
imgUrl,
updateTime,
createTime,
name: giftName,
......@@ -90,6 +93,7 @@ export default {
occupyStock, // 已占用库存
remainedStock, // 可占用库存
totalStock, // 总库存
useStatus, // 状态
};
if(this.type == 1) {
this.skuList = res.result.skuList || [];
......@@ -100,8 +104,9 @@ export default {
if(this.type == 3 || this.type == 4) {
// 入参: welfareId福利id, type: 1:卡券,2:卡券包
couponStockInfo({ welfareId: this.welfareId, type: this.type == 3 ? 1 : 2 }).then(res => {
const { updateTime, createTime, name, remarkName, costPriceRemark, outStock, preStock, occupyStock, remainedStock, totalStock } = res.result;
const { imgUrl, updateTime, createTime, name, remarkName, costPriceRemark, outStock, preStock, occupyStock, remainedStock, totalStock, useStatus } = res.result;
this.info = {
imgUrl,
updateTime,
createTime,
name,
......@@ -112,9 +117,24 @@ export default {
occupyStock, // 已占用库存
remainedStock, // 可占用库存
totalStock, // 总库存
useStatus, // 状态
};
});
}
},
fUseStatus(val) {
const gift = {
1: '正常',
2: '仅隐藏',
3: '正常',
};
const card = {
0: '未生效',
1: '已生效',
2: '已过期',
3: '已禁用',
};
return (this.type == 1 || this.type == 2 ? gift[val] : card[val]);
}
},
watch: {
......@@ -131,34 +151,96 @@ export default {
<style lang="scss" scope>
.welfare-item {
width: 100%;
border: 1px solid $gray-tab;
background: white;
.head {
border-bottom: 1px solid $gray-separator;
font-size: 13px;
background: $gray-thead;
background: $gray-disable;
color: $gray01;
height: 40px;
line-height: 40px;
padding: 0 20px 0;
border-bottom: 1px solid $gray-tab;
label {
color: $gray02;
color: $gray02;
span {
margin-right: 30px;
}
&-type {
margin-right: 20px;
min-width: 100px;
span.btn {
margin-right: 5px;
font-weight: 400;
color: $gray01;
line-height: 40px;
float: right;
cursor: pointer;
}
}
.content {
height: 115px;
height: 83px;
overflow: hidden;
padding: 0;
display: flex;
> div {
margin-left: 20px;
padding-top: 20px;
flex: 1;
line-height: 28px;
padding: 10px 16px;
border-bottom: 1px solid #E4E7ED;
margin-bottom: 20px;;
.f1{
flex: 6;
display: flex;
> * {
flex: 1;
}
border-right: 1px solid #E4E7ED;
> p {
margin-left: 10px;
padding-top: 4px;
font-size: 14px;
font-weight: 400;
color: #606266;
line-height: 20px;
span {
margin-top: 6px;
display: block;
font-size: 18px;
font-weight: 500;
line-height: 21px;
color: $gray01;
}
}
div.detail {
flex: 2;
position: relative;
padding-left: 70px;
img {
position: absolute;
top: 0;
left: 0;
width: 60px;
height: 60px;
border-radius: 4px;
}
p:first-child {
padding-top: 8px;
font-weight: 400;
color: #303133;
line-height: 22px;
margin-bottom: 6px;
& + p {
font-size: 12px;
color: #303133;
line-height: 17px;
}
}
}
}
.f2{
flex: 4;
padding: 0 20px 0;
/deep/ .el-col {
color: #606266;
line-height: 20px;
span {
color: #303133;
}
}
}
}
}
......
src/views/card/gic-card/card-info.js
......@@ -55,15 +55,6 @@ export default {
maxDiscountGoodsCount: undefined,
shopFilter: []
},
// 微盟微商城适用
wmmall: {
switch: false,
feeLimit: 0,
onlyFlag: false,
goodsFilterId: '',
maxDiscountAmount: undefined,
maxDiscountGoodsCount: undefined
},
floorId: '', // 当前楼层id
floor: [
{ name: '基本信息', targetId: 'f1' },
......@@ -143,7 +134,6 @@ export default {
params.applyList = JSON.stringify(params.applyList);
params.useConditionLimit = JSON.stringify(params.useConditionLimit);
this.loading = true;
console.log(params);
if (params !== true) {
return;
}
......@@ -200,37 +190,37 @@ export default {
this.linkData2 = JSON.parse(this.info.cardJumpLink);
}
// 给卡券适用信息赋值
// info.applyList.forEach(v => {
// const { applyType, feeLimit, onlyFlag, maxDiscountAmount, maxDiscountGoodsCount, goodsFilterId, storeFilterId, shopFilter } = v;
// if (applyType === 1) {
// // 线下适用
// this.xxsy = {
// switch: true,
// feeLimit,
// onlyFlag,
// storeFilterId,
// goodsFilterId,
// };
// }
// if (applyType === 2) {
// let shop;
// if (shopFilter) {
// shop = JSON.parse(shopFilter).map(v => {
// return `${v.name}(id:${v.id.slice(-5)})`;
// });
// }
// // GIC微商城适用
// this.gicmall = {
// switch: true,
// feeLimit,
// onlyFlag,
// goodsFilterId,
// maxDiscountAmount,
// maxDiscountGoodsCount,
// shopFilter: shop
// };
// }
// });
info.applyList.forEach(v => {
const { applyType, feeLimit, onlyFlag, maxDiscountAmount, maxDiscountGoodsCount, goodsFilterId, storeFilterId, shopFilter } = v;
if (applyType === 1) {
// 线下适用
this.xxsy = {
switch: true,
feeLimit,
onlyFlag,
storeFilterId,
goodsFilterId,
};
}
if (applyType === 2) {
let shop;
if (shopFilter) {
shop = JSON.parse(shopFilter).map(v => {
return `${v.name}(id:${v.id.slice(-5)})`;
});
}
// GIC微商城适用
this.gicmall = {
switch: true,
feeLimit,
onlyFlag,
goodsFilterId,
maxDiscountAmount,
maxDiscountGoodsCount,
shopFilter: shop
};
}
});
this.loading = false;
this.$emit('updateLoading', false);
}).finally(() => {
......
src/views/card/gic-card/card-info.vue
......@@ -103,14 +103,13 @@
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="common-title mb25 mt60" id="f3">适用信息</div>
<!-- 线下适用门店 -->
<el-form-item label="线下门店适用">
<el-switch v-model="xxsy.switch" disabled />
</el-form-item>
<template v-if="xxsy.switch">
<el-form-item label="DEMO券号">{{ info.erpDemoCode }}</el-form-item>
<el-form-item label="DEMO券号">{{ info.erpDemoCode || '--' }}</el-form-item>
<el-form-item label="消费金额门槛">
{{ xxsy.feeLimit }} 元
<!-- <el-checkbox class="ml20" v-model="xxsy.onlyFlag" disabled>不与其它优惠共享</el-checkbox> -->
......@@ -128,7 +127,6 @@
</template>
<!-- GIC微商城适用 -->
<el-form-item label="GIC微商城适用">
<el-switch v-model="gicmall.switch" disabled />
</el-form-item>
<template v-if="gicmall.switch">
......@@ -145,7 +143,7 @@
</el-form-item>
</template>
</el-form>
<!-- 楼层 -->
<ul class="floor">
<li v-for="(item, idx) in floor" :key="idx" :class="{ active: item.targetId === floorId }" @click="toFloor(item)"><span>{{ item.name }}</span></li>
......
src/views/card/gic-card/card-list.vue
......@@ -60,7 +60,7 @@
<template slot-scope="scope">
<div class="card">
<img :src="scope.row.imgUrl" draggable="false" />
<p class="name">{{ scope.row.cardName }}</p>
<p class="name ellipsis-100" :title="scope.row.cardName">{{ scope.row.cardName }}</p>
<p :title="scope.row.subTitle" class="fz12 gray-lighter ellipsis-100" style="line-height:17px;">
<el-popover placement="top-start" width="300" trigger="hover" open-delay="200" :offset="-8">
<div class="gray01 fz14">
......@@ -94,7 +94,7 @@
</div>
<i class="el-icon-question cursor fz12 gray-lighter" slot="reference" style="position:relative;"></i>
</el-popover>
可占库存：{{ scope.row.remainedStock || 0 }}
{{ scope.row.remainedStock || 0 }}
<el-button v-if="[11, 12].includes(scope.row._status) && scope.row.customCodeFlag === 0" @click="preAdjustStock(scope.row)" class="hover-btn" icon="el-icon-edit-outline ml5" type="text"></el-button>
<el-button v-if="[11, 12].includes(scope.row._status) && scope.row.customCodeFlag == 2" class="hover-btn" @click="uploadCode(scope.row)" icon="iconfont-market4 icon-shangchuan" type="text"></el-button>
</template>
......
src/views/card/gic-card/destory-list.vue
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<el-date-picker class="w400 mr10" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<el-date-picker class="w350 mr10" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="refresh"></el-date-picker>
<!-- <el-select class="w160 mr10" v-model="listParams.destoryMode" clearable placeholder="所有销毁方式" @change="refresh">
<el-option v-for="(item, index) in destoryType" :key="index" :label="item.label" :value="item.value"></el-option>
</el-select> -->
<el-input v-model="listParams.search" class="w300 mrAuto" placeholder="请输入卡券名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<dm-perm-button icon="iconfont-market4 icon-icon_yunxiazai mr5" :disabled="$itemPerm($itemCode.gicCardDestory)" type="danger" @click="showDialog('add', {})">卡券销毁</dm-perm-button>
<el-input v-model="listParams.search" class="w260 mrAuto" placeholder="请输入卡券名称" clearable @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<dm-perm-button class="specter" :disabled="$itemPerm($itemCode.gicCardDestory)" type="danger" @click="showDialog('add', {})">卡券销毁</dm-perm-button>
</div>
<el-table tooltip-effect="dark" :data="tableList" style="width:100%">
<el-table-column v-for="(v, i) in tableHeader" :fixed="v.fixed" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :sortable="v.sortable">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment