Skip to content

W
welfare
Commit 9674e7e9 by 陈羽
Options

update: 福利中心创建卡券包点击保存后跳转到卡券包列表页

parent 8ca3c07f
Showing with 36 additions and 37 deletions
dist/css/card-package.64cfc038.css → dist/css/card-package.ec195fa9.css
.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-6c0b7865]{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-6c0b7865]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-11206469]{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-11206469]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-27bf818c.9eaf2884.css 0 → 100644
.ml8[data-v-5f8a1d3e]{margin-left:8px}.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-4dae6b42]{width:360px}.w-160[data-v-4dae6b42]{width:160px}.w140[data-v-4dae6b42]{width:140px}.w350[data-v-4dae6b42]{width:350px}.mr4[data-v-4dae6b42]{margin-right:4px}.tab-top[data-v-4dae6b42]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-4dae6b42],.tab-top[data-v-4dae6b42]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-4dae6b42]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-4dae6b42]{height:60px}.table-content .img-text img[data-v-4dae6b42]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-4dae6b42]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-4dae6b42]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-4dae6b42]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-4dae6b42]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-4dae6b42]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-4dae6b42]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-4dae6b42]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-4dae6b42]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-4dae6b42]:hover{color:#2f54ed}.undeline-dash[data-v-4dae6b42]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-4dae6b42]{display:inline-block;line-height:32px}.hidden-data[data-v-4dae6b42]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-b428b852.23d9cd2d.css deleted 100644 → 0
.ml8[data-v-5f8a1d3e]{margin-left:8px}.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-5a16c968]{width:360px}.w-160[data-v-5a16c968]{width:160px}.w140[data-v-5a16c968]{width:140px}.w350[data-v-5a16c968]{width:350px}.mr4[data-v-5a16c968]{margin-right:4px}.tab-top[data-v-5a16c968]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-5a16c968],.tab-top[data-v-5a16c968]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-5a16c968]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-5a16c968]{height:60px}.table-content .img-text img[data-v-5a16c968]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-5a16c968]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-5a16c968]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-5a16c968]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-5a16c968]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-5a16c968]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-5a16c968]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-5a16c968]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-5a16c968]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-5a16c968]:hover{color:#2f54ed}.undeline-dash[data-v-5a16c968]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-5a16c968]{display:inline-block;line-height:32px}.hidden-data[data-v-5a16c968]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/index.html
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link href=//at.alicdn.com/t/font_1434755_up9fc92yhi.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_1s8bd0r1t2ri.css><title>福利中心</title><link href=/welfare/css/card-package.64cfc038.css rel=prefetch><link href=/welfare/css/card-package~gic-card.06e52b24.css rel=prefetch><link href=/welfare/css/chunk-033d13cc.257a37dd.css rel=prefetch><link href=/welfare/css/chunk-281bf001.01c58546.css rel=prefetch><link href=/welfare/css/chunk-3195a346.af72490c.css rel=prefetch><link href=/welfare/css/chunk-447f9844.f11404c0.css rel=prefetch><link href=/welfare/css/chunk-5507bcee.29bf9e26.css rel=prefetch><link href=/welfare/css/chunk-593e752c.8f300845.css rel=prefetch><link href=/welfare/css/chunk-7169942a.3f8dd8f3.css rel=prefetch><link href=/welfare/css/chunk-789d3980.9fbf7749.css rel=prefetch><link href=/welfare/css/chunk-a144d7ae.855b4e1e.css rel=prefetch><link href=/welfare/css/chunk-a7320cc8.a794f702.css rel=prefetch><link href=/welfare/css/chunk-b428b852.23d9cd2d.css rel=prefetch><link href=/welfare/css/chunk-d7364742.be14d1e8.css rel=prefetch><link href=/welfare/css/gic-card.bd47464a.css rel=prefetch><link href=/welfare/js/card-package.3f5e9d28.js rel=prefetch><link href=/welfare/js/card-package~gic-card.2483ec97.js rel=prefetch><link href=/welfare/js/chunk-033d13cc.974790ca.js rel=prefetch><link href=/welfare/js/chunk-0d4ebdfa.9e9e2d4f.js rel=prefetch><link href=/welfare/js/chunk-281bf001.7b9a7c56.js rel=prefetch><link href=/welfare/js/chunk-3195a346.b1677e9b.js rel=prefetch><link href=/welfare/js/chunk-447f9844.34677840.js rel=prefetch><link href=/welfare/js/chunk-5507bcee.51862423.js rel=prefetch><link href=/welfare/js/chunk-593e752c.960430ad.js rel=prefetch><link href=/welfare/js/chunk-6287d3af.e888dad7.js rel=prefetch><link href=/welfare/js/chunk-7169942a.29f26b81.js rel=prefetch><link href=/welfare/js/chunk-789d3980.e044ce4e.js rel=prefetch><link href=/welfare/js/chunk-a144d7ae.ab66902d.js rel=prefetch><link href=/welfare/js/chunk-a7320cc8.819c80a5.js rel=prefetch><link href=/welfare/js/chunk-b428b852.542cba9f.js rel=prefetch><link href=/welfare/js/chunk-d7364742.3b61d8ca.js rel=prefetch><link href=/welfare/js/chunk-db6a8f34.e6445d1d.js rel=prefetch><link href=/welfare/js/gic-card.f3c991c7.js rel=prefetch><link href=/welfare/css/app.2296541b.css rel=preload as=style><link href=/welfare/js/app.69d0a545.js rel=preload as=script><link href=/welfare/js/chunk-vendors.34f063f2.js rel=preload as=script><link href=/welfare/css/app.2296541b.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function() {
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link href=//at.alicdn.com/t/font_1434755_up9fc92yhi.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_1s8bd0r1t2ri.css><title>福利中心</title><link href=/welfare/css/card-package.ec195fa9.css rel=prefetch><link href=/welfare/css/card-package~gic-card.06e52b24.css rel=prefetch><link href=/welfare/css/chunk-033d13cc.257a37dd.css rel=prefetch><link href=/welfare/css/chunk-27bf818c.9eaf2884.css rel=prefetch><link href=/welfare/css/chunk-281bf001.01c58546.css rel=prefetch><link href=/welfare/css/chunk-3195a346.af72490c.css rel=prefetch><link href=/welfare/css/chunk-447f9844.f11404c0.css rel=prefetch><link href=/welfare/css/chunk-5507bcee.29bf9e26.css rel=prefetch><link href=/welfare/css/chunk-593e752c.8f300845.css rel=prefetch><link href=/welfare/css/chunk-7169942a.3f8dd8f3.css rel=prefetch><link href=/welfare/css/chunk-789d3980.9fbf7749.css rel=prefetch><link href=/welfare/css/chunk-a144d7ae.855b4e1e.css rel=prefetch><link href=/welfare/css/chunk-a7320cc8.a794f702.css rel=prefetch><link href=/welfare/css/chunk-d7364742.be14d1e8.css rel=prefetch><link href=/welfare/css/gic-card.bd47464a.css rel=prefetch><link href=/welfare/js/card-package.d5ba09fb.js rel=prefetch><link href=/welfare/js/card-package~gic-card.2483ec97.js rel=prefetch><link href=/welfare/js/chunk-033d13cc.974790ca.js rel=prefetch><link href=/welfare/js/chunk-0d4ebdfa.9e9e2d4f.js rel=prefetch><link href=/welfare/js/chunk-27bf818c.abe5f22f.js rel=prefetch><link href=/welfare/js/chunk-281bf001.7b9a7c56.js rel=prefetch><link href=/welfare/js/chunk-3195a346.b1677e9b.js rel=prefetch><link href=/welfare/js/chunk-447f9844.34677840.js rel=prefetch><link href=/welfare/js/chunk-5507bcee.51862423.js rel=prefetch><link href=/welfare/js/chunk-593e752c.960430ad.js rel=prefetch><link href=/welfare/js/chunk-6287d3af.e888dad7.js rel=prefetch><link href=/welfare/js/chunk-7169942a.29f26b81.js rel=prefetch><link href=/welfare/js/chunk-789d3980.e044ce4e.js rel=prefetch><link href=/welfare/js/chunk-a144d7ae.ab66902d.js rel=prefetch><link href=/welfare/js/chunk-a7320cc8.819c80a5.js rel=prefetch><link href=/welfare/js/chunk-d7364742.3b61d8ca.js rel=prefetch><link href=/welfare/js/chunk-db6a8f34.e6445d1d.js rel=prefetch><link href=/welfare/js/gic-card.f3c991c7.js rel=prefetch><link href=/welfare/css/app.2296541b.css rel=preload as=style><link href=/welfare/js/app.ff53c89f.js rel=preload as=script><link href=/welfare/js/chunk-vendors.34f063f2.js rel=preload as=script><link href=/welfare/css/app.2296541b.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function() {
var host = window.location.host;
document.write('<script src="//'+ (host == 'ideal.demogic.com' ? host : 'four.gicdev.com') + '/component-library/static/import-component.js?timestrap='+ new Date().getTime() +'"><\/script>')
})()</script><script src=/welfare/js/chunk-vendors.34f063f2.js></script><script src=/welfare/js/app.69d0a545.js></script></body></html>
\ No newline at end of file
})()</script><script src=/welfare/js/chunk-vendors.34f063f2.js></script><script src=/welfare/js/app.ff53c89f.js></script></body></html>
\ No newline at end of file
src/views/card/card-package/form.vue
......@@ -140,8 +140,12 @@
</div>
</el-form-item>
<el-form-item>
<el-button type="primary" v-if="isAdd" @click="addForm">保存并添加卡券</el-button>
<el-button type="primary" v-else @click="editForm">保存</el-button>
<el-button type="primary"
v-if="isAdd"
@click="addForm">保存并添加卡券</el-button>
<el-button type="primary"
v-else
@click="editForm">保存</el-button>
</el-form-item>
</el-form>
<div class="hidden">
......@@ -261,9 +265,9 @@ export default {
},
methods: {
renderStatus(row) {
if(row.welfareStatus == 2) {
if (row.welfareStatus == 2) {
return '<span class="state-point state-point-error">已删除</span>';
} else if(row.welfareStatus == 3) {
} else if (row.welfareStatus == 3) {
return '<span class="state-point state-point-error">已过期</span>';
} else {
let { _status } = mappingCardStatus(row);
......@@ -287,7 +291,7 @@ export default {
_cl = 'state-point-default';
break;
}
return `<span class="state-point ${_cl}">${cardStatus[_status] || '未知状态'}</span>`;
return `<span class="state-point ${_cl}">${cardStatus[ _status ] || '未知状态'}</span>`;
}
},
getRelationId() {
......@@ -329,11 +333,11 @@ export default {
this.cardLoading = false;
this.refreshCouponList();
let callbackId = this.$route.query.callbackId;
if(callbackId) {
if (callbackId) {
// 有callbackId参数时，认为入口是福利选择器组件
// 操作完成后需要修改localStorage中的welfareCreateCallback，以触发福利选择器内部数据更新
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[callbackId] = true;
obj[ callbackId ] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
}
}).catch(() => {
......@@ -380,7 +384,7 @@ export default {
if (this.loading) {
return;
}
if(!this.$refs.accg.validate()) return;
if (!this.$refs.accg.validate()) return;
this.$refs.ruleForm.validate((valid) => {
if (!valid) {
PublicMethods.jumpToFormError(); // eslint-disable-line
......@@ -395,32 +399,32 @@ export default {
params.operAuth = params.operAuth.join(',');
}
this.loading = true;
this.$refs.accg.save().then(res=>{
this.$refs.accg.save().then(res => {
addPackages(params).then(res => {
this.loading = false;
this.$tips({ message: `${ this.isAdd ? '新建' : '编辑' }成功`, type: 'success' });
if(this.isAdd) {
this.$tips({ message: `${this.isAdd ? '新建' : '编辑'}成功`, type: 'success' });
if (this.isAdd) {
this.$store.commit('updateShowCornerCanUseApp', true);
let callbackId = this.$route.query.callbackId;
if(callbackId) {
if (callbackId) {
// 有callbackId参数时，认为入口是福利选择器组件
// 操作完成后需要修改localStorage中的welfareCreateCallback，以触发福利选择器内部数据更新
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[callbackId] = true;
obj[ callbackId ] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
}
}
this.$router.push('/card-package/list');
// if(!this.isAdd) {
// this.$router.push('/card-package/list');
// } else {
// this.isEcho = true;
// this.$router.push(`/card-package/edit?id=${res.result}`);
// }
// this.$router.push('/card-package/list');
if (!this.isAdd) {
this.$router.push('/card-package/list');
} else {
this.isEcho = true;
this.$router.push(`/card-package/edit?id=${res.result}`);
}
}).finally(() => {
this.loading = false;
});
}).catch(err=>{
}).catch(err => {
this.$message.error(err.message);
});
}
......@@ -447,8 +451,9 @@ export default {
};
this.loading = true;
editPackages(params).then(res => {
this.getInfo(true);
// this.getInfo(true);
this.loading = false;
this.$router.push('/card-package/list');
}).catch(() => {
this.loading = false;
});
......
src/views/gift-manage/real-gift.vue
......@@ -111,8 +111,7 @@
<span slot="content" style="width:240px">
可占库存：福利可以被直接使用和被应用占用的数量；<br>
已占用：福利已经被应用通过”固定库存“方式占用的数量；<br>
总库存：福利实际未产生履约单，还可以被出库的数量；<br>
履约数：福利从创建到现在已生成履约单的数量；
总库存：福利实际未产生履约单，还可以被出库的数量；
</span>
</el-tooltip>
</template>
......@@ -138,12 +137,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">履约数</span>
<span slot="content" style="width:240px">
可占库存：福利可以被直接使用和被应用占用的数量；<br>
已占用：福利已经被应用通过”固定库存“方式占用的数量；<br>
总库存：福利实际未产生履约单，还可以被出库的数量；<br>
履约数：福利从创建到现在已生成履约单的数量；
</span>
<span slot="content" style="width:240px">履约数：福利从创建到现在已生成履约单的数量；</span>
</el-tooltip>
</template>
<template slot-scope="scope">
......
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