Skip to content

W
welfare
Commit 226c311c by 萱草
Options

update: UI规范调整

parent 5c6207e1
Showing with 95 additions and 48 deletions
dist/css/card-package.5240cb39.css → dist/css/card-package.659cdc17.css
.ml40[data-v-744f9835]{margin-left:40px}.filter-block[data-v-744f9835]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-744f9835]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-744f9835]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-744f9835]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-744f9835]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3278d8dd]{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-3278d8dd]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-744f9835]{margin-left:40px}.filter-block[data-v-744f9835]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-744f9835]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-744f9835]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-744f9835]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-744f9835]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-6d953dfe]{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-6d953dfe]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-0860f57a.d0a8384e.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-60ceb8dc]{width:360px}.w-160[data-v-60ceb8dc]{width:160px}.w140[data-v-60ceb8dc]{width:140px}.w350[data-v-60ceb8dc]{width:350px}.tab-top[data-v-60ceb8dc]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-60ceb8dc],.tab-top[data-v-60ceb8dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-60ceb8dc]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-60ceb8dc]{height:60px}.table-content .img-text img[data-v-60ceb8dc]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-60ceb8dc]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-60ceb8dc]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-60ceb8dc]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-60ceb8dc]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-60ceb8dc]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-60ceb8dc]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-60ceb8dc]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-60ceb8dc]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-60ceb8dc]:hover{color:#2f54ed}.undeline-dash[data-v-60ceb8dc]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-60ceb8dc]{display:inline-block;line-height:32px}.hidden-data[data-v-60ceb8dc]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-30fdcc87.a7467351.css 0 → 100644
.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}.file-style:hover .upload-trigger[data-v-30465c69]{border-color:#1890ff}.upload-ele .el-button[data-v-30465c69]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-30465c69]{padding:0}.uploadText p[data-v-30465c69]{line-height:26px}.pickup-upload[data-v-30465c69]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-30465c69]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-30465c69]{font-size:14px}.pickup-upload .pickup-list[data-v-30465c69]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-30465c69]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-30465c69]{font-size:14px}.w360[data-v-458d8bf0]{width:360px}.w-160[data-v-458d8bf0]{width:160px}.w140[data-v-458d8bf0]{width:140px}.w350[data-v-458d8bf0]{width:350px}.mr4[data-v-458d8bf0]{margin-right:4px}.tab-top[data-v-458d8bf0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-458d8bf0],.tab-top[data-v-458d8bf0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-458d8bf0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-458d8bf0]{height:60px}.table-content .img-text img[data-v-458d8bf0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-458d8bf0]{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-458d8bf0]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-458d8bf0]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-458d8bf0]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-458d8bf0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-458d8bf0]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-458d8bf0]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-458d8bf0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-458d8bf0]:hover{color:#2f54ed}.undeline-dash[data-v-458d8bf0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-458d8bf0]{display:inline-block;line-height:32px}.hidden-data[data-v-458d8bf0]{max-width:180px;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-3a00490d.25bb4e21.css deleted 100644 → 0
.step-text[data-v-cba8a022]{color:#000;font-size:14px}.dash-style[data-v-cba8a022]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-cba8a022]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-cba8a022]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-cba8a022]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-cba8a022]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-cba8a022]{padding:0}.w-630[data-v-cba8a022]{width:630px}.mb56[data-v-cba8a022]{margin-bottom:56px}.from-content[data-v-cba8a022]{position:relative}.from-content .demo-ruleForm .form-section[data-v-cba8a022]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-cba8a022]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-cba8a022]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-cba8a022]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-cba8a022]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-cba8a022]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-cba8a022]{margin-top:12px}.from-content .anchor-link[data-v-cba8a022]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-cba8a022]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-cba8a022]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-cba8a022]:hover{color:#2f54ed}.ml20[data-v-cba8a022]{margin-left:20px}.mr10[data-v-cba8a022]{margin-right:10px}.tips-content[data-v-cba8a022]{position:absolute;left:-4px;top:6px}.store-tips[data-v-cba8a022]{width:200px;position:absolute;left:-10px}.underline[data-v-cba8a022]{text-decoration:underline}.pickup-upload[data-v-cba8a022]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-cba8a022]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-cba8a022]{font-size:14px}.pickup-upload .pickup-list[data-v-cba8a022]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-cba8a022]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-cba8a022]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-a3d44a22.669940f7.css deleted 100644 → 0
.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}.file-style:hover .upload-trigger[data-v-30465c69]{border-color:#1890ff}.upload-ele .el-button[data-v-30465c69]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-30465c69]{padding:0}.uploadText p[data-v-30465c69]{line-height:26px}.pickup-upload[data-v-30465c69]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-30465c69]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-30465c69]{font-size:14px}.pickup-upload .pickup-list[data-v-30465c69]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-30465c69]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-30465c69]{font-size:14px}.w360[data-v-093160e1]{width:360px}.w-160[data-v-093160e1]{width:160px}.w140[data-v-093160e1]{width:140px}.w350[data-v-093160e1]{width:350px}.tab-top[data-v-093160e1]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-093160e1],.tab-top[data-v-093160e1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-093160e1]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-093160e1]{height:60px}.table-content .img-text img[data-v-093160e1]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-093160e1]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-093160e1]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-093160e1]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-093160e1]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-093160e1]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-093160e1]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-093160e1]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-093160e1]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-093160e1]:hover{color:#2f54ed}.undeline-dash[data-v-093160e1]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-093160e1]{display:inline-block;line-height:32px}.hidden-data[data-v-093160e1]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-ee443d42.17967233.css 0 → 100644
.step-text[data-v-90c9dcbc]{color:#000;font-size:14px}.dash-style[data-v-90c9dcbc]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-90c9dcbc]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-90c9dcbc]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-90c9dcbc]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-90c9dcbc]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-90c9dcbc]{padding:0}.w-630[data-v-90c9dcbc]{width:630px}.mb56[data-v-90c9dcbc]{margin-bottom:56px}.from-content[data-v-90c9dcbc]{position:relative}.from-content .demo-ruleForm .form-section[data-v-90c9dcbc]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-90c9dcbc]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-90c9dcbc]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-90c9dcbc]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-90c9dcbc]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-90c9dcbc]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-90c9dcbc]{margin-top:12px}.from-content .anchor-link[data-v-90c9dcbc]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-90c9dcbc]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-90c9dcbc]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-90c9dcbc]:hover{color:#2f54ed}.ml20[data-v-90c9dcbc]{margin-left:20px}.mr10[data-v-90c9dcbc]{margin-right:10px}.tips-content[data-v-90c9dcbc]{position:absolute;left:-4px;top:6px}.store-tips[data-v-90c9dcbc]{width:200px;position:absolute;left:-10px}.underline[data-v-90c9dcbc]{text-decoration:underline}.pickup-upload[data-v-90c9dcbc]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-90c9dcbc]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-90c9dcbc]{font-size:14px}.pickup-upload .pickup-list[data-v-90c9dcbc]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-90c9dcbc]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-90c9dcbc]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-fa650fdc.8e509282.css 0 → 100644
.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-cb6be5dc]{border-right:1px solid #ebeef5}.w360[data-v-193afb5c]{width:360px}.w-160[data-v-193afb5c]{width:160px}.w140[data-v-193afb5c]{width:140px}.w350[data-v-193afb5c]{width:350px}.mr4[data-v-193afb5c]{margin-right:4px}.tab-top[data-v-193afb5c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-193afb5c],.tab-top[data-v-193afb5c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-193afb5c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-193afb5c]{height:60px}.table-content .img-text img[data-v-193afb5c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-193afb5c]{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-193afb5c]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-193afb5c]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-193afb5c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-193afb5c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-193afb5c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-193afb5c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-193afb5c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-193afb5c]:hover{color:#2f54ed}.undeline-dash[data-v-193afb5c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-193afb5c]{display:inline-block;line-height:32px}.hidden-data[data-v-193afb5c]{max-width:180px;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/js/gic-card.45090f89.js → dist/js/gic-card.058e4436.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/module/check-upload-detail.vue
<template>
<el-dialog title="查看内容" :visible.sync="dialogVisible" width="500px" @close="cancelSubmit()">
<el-dialog title="查看内容" :visible.sync="dialogVisible" width="600px" @close="cancelSubmit()">
<div v-loading="loading">
<div v-if="!isEdit" style="background: #F7F8FA;margin-bottom:20px">
<div v-html="template" style="font-size:12px;line-height:22px"></div>
<div v-html="template" style="font-size:12px;line-height:22px;margin:0 16px;padding:12px 0"></div>
</div>
<div>
<el-input placeholder="请输入会员信息搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @change="getTableList" @clear="getTableList"></el-input>
</div>
<el-table :data="tableData" class="mt20">
<el-table-column v-for="(item, index) in headList" :key="index" :label="item" :prop="index === 0 ? 'paramOne' : (index === 1 ? 'paramTwo' : 'paramThree')"></el-table-column>
<el-table-column min-width="100px" show-overflow-tooltip v-for="(item, index) in headList" :key="index" :label="item" :prop="index === 0 ? 'paramOne' : (index === 1 ? 'paramTwo' : 'paramThree')"></el-table-column>
<!-- <el-table-column label="卡号" prop="paramOne"></el-table-column>
<el-table-column label="卡密/券码" prop="paramTwo"></el-table-column> -->
<el-table-column label="当前状态" prop="statusFlag">
<template slot-scope="scope">{{ scope.row.statusFlag === 0 ? '未兑换' : '已兑换' }}</template>
<template slot-scope="scope"><span class="state-point" :class="[ scope.row.statusFlag ? 'state-point-success' : 'state-point-warning' ]">{{ scope.row.statusFlag === 0 ? '未兑换' : '已兑换' }}</span></template>
</el-table-column>
<el-table-column label="用户/会员" prop="name"></el-table-column>
</el-table>
......@@ -50,7 +50,7 @@ export default {
dialogVisible: false,
loading: false,
currentPage: 1,
pageSize: 10,
pageSize: 4,
total: '',
tableData: [],
template: '',
......
src/views/gift-manage/module/update-real-cost.vue
......@@ -25,6 +25,7 @@
</template>
</el-table-column>
</el-table>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处<i class="el-icon-edit-outline"></i>按钮进行批量设置</p>
</div>
<el-form class="mt20" v-else>
<el-form-item label="成本费用" required>
......
src/views/gift-manage/module/update-real-stock.vue
<template>
<el-dialog title="调整库存" :visible.sync="dialogVisible" width="750px" @close="cancelSubmit()">
<div v-loading="loading">
<!-- <div v-if="goodsSkuList.length > 1" :class="[ heightLoading ? 'startHeight1' : '' ]"> -->
<div v-if="goodsSkuList.length > 1">
<el-table :data="goodsSkuList" :span-method="objectSpanMethod" border>
<el-table-column width="140px" v-for="(i, k) in skuCols" :label="i" :key="k" :class-name="k == skuCols.length - 1 ? 'pad-l-20' : 'right-border'">
......@@ -40,7 +41,9 @@
</template>
</el-table-column>
</el-table>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处<i class="el-icon-edit-outline"></i>按钮进行批量设置</p>
</div>
<!-- <el-form class="mt20" v-else :class="[ heightLoading ? 'startHeight2' : '' ]"> -->
<el-form class="mt20" v-else>
<el-form-item label="可占库存" required>
<template>
......@@ -99,7 +102,8 @@ export default {
skuCols: [],
goodsSkuList: [],
stock: 0,
giftSkuId: ''
giftSkuId: '',
// heightLoading: false,
};
},
created() {
......@@ -113,6 +117,7 @@ export default {
let params = {
id: this.giftId
};
// this.heightLoading = true;
giftGet(params).then(res =>{
if(res.code === '0000'){
this.giftSpecInfo = res.result.giftSpecInfo;
......@@ -168,6 +173,7 @@ export default {
}else{
this.giftSkuId = skuList[0].giftSkuId;
}
// this.heightLoading = false;
}
});
console.log('获取成本数据');
......@@ -370,9 +376,15 @@ export default {
}
};
</script>
<style scoped></style>
<style>
<style scoped>
.right-border {
border-right: 1px solid #ebeef5;
}
</style>
\ No newline at end of file
/* .startHeight1{
height: 400px;
}
.startHeight2{
height: 200px;
} */
</style>
<style></style>
\ No newline at end of file
src/views/gift-manage/real-gift.vue
......@@ -13,7 +13,7 @@
<el-option label="福利id" :value="0"></el-option>
</el-select>
</el-input>
<el-select v-model="query.hiddenFlag" placeholder="礼品状态" class="w-160 mr10" clearable @change="getSearchList">
<el-select v-model="query.hiddenFlag" placeholder="所有礼品状态" class="w-160 mr10" clearable @change="getSearchList">
<el-option label="显示" :value="0"></el-option>
<el-option label="隐藏" :value="1"></el-option>
</el-select>
......@@ -31,24 +31,24 @@
<el-button type="primary" @click="add">新建礼品</el-button>
</div>
</div>
<div style="margin: 20px 20px 0px 20px;" v-if="unfoldStatus">
<div style="height:32px;">
<div class="spanclass">福利成本：</div>
<div style="margin: 20px 20px 0px 20px;background: #F7F8FA;height:124px;padding-top:20px" v-if="unfoldStatus">
<div style="height:32px">
<div class="spanclass" style="margin-left:20px;color:#303133">福利成本：</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass">-</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass" style="margin-right:28px">更新时间：</div>
<div class="spanclass" style="margin-right:28px;color:#303133">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
<el-option label="由近及远" :value="0"></el-option>
<el-option label="由远及近" :value="1"></el-option>
</el-select>
</div>
<div class="mt20" style="height:32px;">
<div class="spanclass">可占库存：</div>
<div class="spanclass" style="margin-left:20px;color:#303133">可占库存：</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">-</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 mr40 w140" v-model="query.endStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">更新时间范围：</div>
<div class="spanclass" style="color:#303133">更新时间范围：</div>
<el-date-picker v-model="timeValue" @change="changeTime" type="datetimerange" class="w350" align="right" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</div>
</div>
......@@ -65,13 +65,13 @@
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="hover" @show="getName(scope.row.giftName)">
<el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
</div>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
<el-button class="cancle-button" type="dafault" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" @click="onCancel(scope.row)">取消</el-button>
<el-button type="primary" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
</div>
<i class="el-icon-edit-outline inline-block ml5" slot="reference"></i>
</el-popover>
......@@ -82,7 +82,7 @@
<p>福利id：{{ scope.row.giftId }}</p>
<div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question inline-block mr5"></i>
<i class="el-icon-question inline-block mr4"></i>
</el-tooltip>
礼品编码：{{ scope.row.giftNo || '--' }}
</p>
......@@ -119,7 +119,7 @@
<p class="goods-code">已占用：{{ scope.row.occupyStock }}</p>
<p class="goods-code">总库存：{{ scope.row.totalStock }}</p>
</div>
<i class="el-icon-question inline-block mr5" style="color:#909399"></i>
<i class="el-icon-question inline-block mr4" style="color:#909399"></i>
</el-tooltip>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)"></i>
......@@ -289,6 +289,9 @@ export default {
this.getTableList();
this.handleChangeType();
},
onCancel(row) {
row.visible = false;
},
// 列表筛选条件更改
handleChangeType() {
if (this.query.type === 1) {
......@@ -312,6 +315,9 @@ export default {
};
giftPage(params).then(res =>{
this.tableData = res.result.result;
this.tableData.forEach(item =>{
this.$set(item, 'visible', false);
});
}).finally(() => this.loading = false);
},
handleSizeChange(value){
......@@ -553,13 +559,15 @@ export default {
if(res.code === '0000'){;
this.$message.success('修改成功');
this.getTableList();
item.visible = true;
}else{
this.$message.error(res.message);
}
});
},
getName(val){
this.changeName = val;
this.changeName = val.giftName;
val.visible = true;
},
// 更新库存
updateStock(item) {
......@@ -605,6 +613,9 @@ export default {
.w350{
width: 350px;
}
.mr4{
margin-right: 4px;
}
.tab-top {
height: 32px;
margin: 20px 20px 0px 20px;
......@@ -630,9 +641,9 @@ export default {
.text {
display: inline-block;
vertical-align: top;
width: 75%;
width: 74%;
height: 60px;
margin-left: 3px;
margin-left: 10px;
font-size: 13px;
line-height: 14px;
position: relative;
......@@ -700,4 +711,9 @@ export default {
.stock-box .el-tooltip__popper{
width: 150px;
}
.popver-button .cancle-button:hover{
color: #2f54eb;
border-color: #2f54eb;
background-color: #fff;
}
</style>
\ No newline at end of file
src/views/gift-manage/virtual-gift-detail.vue
......@@ -725,7 +725,7 @@ export default {
font-size: 14px;
font-weight: 700;
margin-bottom: 31px;
margin-left: 20px;
// margin-left: 20px;
padding-bottom: 9px;
border-bottom: 1px solid #dfdfdf;
}
......
src/views/gift-manage/virtual-gift.vue
......@@ -13,7 +13,7 @@
<el-option label="福利id" :value="0"></el-option>
</el-select>
</el-input>
<el-select v-model="query.hiddenFlag" placeholder="礼品状态" class="w-160 mr10" clearable @change="getSearchList">
<el-select v-model="query.hiddenFlag" placeholder="所有礼品状态" class="w-160 mr10" clearable @change="getSearchList">
<el-option label="显示" :value="0"></el-option>
<el-option label="隐藏" :value="1"></el-option>
</el-select>
......@@ -31,24 +31,24 @@
<el-button type="primary" @click="add">新建礼品</el-button>
</div>
</div>
<div style="margin: 20px 20px 0px 20px;" v-if="unfoldStatus">
<div style="margin: 20px 20px 0px 20px;background: #F7F8FA;height:124px;padding-top:20px" v-if="unfoldStatus">
<div style="height:32px;">
<div class="spanclass">福利成本：</div>
<div class="spanclass" style="margin-left:20px;color:#303133">福利成本：</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass">-</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass" style="margin-right:28px">更新时间：</div>
<div class="spanclass" style="margin-right:28px;color:#303133">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
<el-option label="由近及远" :value="0"></el-option>
<el-option label="由远及近" :value="1"></el-option>
</el-select>
</div>
<div class="mt20" style="height:32px;">
<div class="spanclass">可占库存：</div>
<div class="spanclass" style="margin-left:20px;color:#303133">可占库存：</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">-</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 w140 mr40" v-model="query.endStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">更新时间范围：</div>
<div class="spanclass" style="color:#303133">更新时间范围：</div>
<el-date-picker v-model="timeValue" @change="changeTime" type="datetimerange" class="w350" align="right" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</div>
</div>
......@@ -65,13 +65,13 @@
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="hover" @show="getName(scope.row.giftName)">
<el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
</div>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
<el-button class="cancle-button" type="dafault" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" @click="onCancel(scope.row)">取消</el-button>
<el-button type="primary" size="small" style="line-height:22px;padding:0 5px;min-width: auto!important" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
</div>
<i class="el-icon-edit-outline inline-block ml5" style="margin-top:-5px" slot="reference"></i>
</el-popover>
......@@ -82,7 +82,7 @@
<p class="goods-code">福利id：{{ scope.row.giftId }}</p>
<div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question"></i>
<i class="el-icon-question mr4"></i>
</el-tooltip>
礼品编码：{{ scope.row.giftNo || '--' }}
</p>
......@@ -119,7 +119,7 @@
<p class="goods-code">已占用：{{ scope.row.occupyStock }}</p>
<p class="goods-code">总库存：{{ scope.row.totalStock }}</p>
</div>
<i class="el-icon-question inline-block mr5" style="color:#909399"></i>
<i class="el-icon-question inline-block mr4" style="color:#909399"></i>
</el-tooltip>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)"></i>
......@@ -318,6 +318,9 @@ export default {
this.getTableList();
this.handleChangeType();
},
onCancel(row) {
row.visible = false;
},
// 列表筛选条件更改
handleChangeType() {
if (this.query.type === 1) {
......@@ -339,6 +342,9 @@ export default {
};
giftPage(params).then(res =>{
this.tableData = res.result.result;
this.tableData.forEach(item =>{
this.$set(item, 'visible', false);
});
}).finally(() => this.loading = false);
},
handleSizeChange(value){
......@@ -625,13 +631,15 @@ export default {
if(res.code === '0000'){;
this.$message.success('修改成功');
this.getTableList();
item.visible = true;
}else{
this.$message.error(res.message);
}
});
},
getName(val){
this.changeName = val;
this.changeName = val.giftName;
val.visible = true;
},
// 更新库存
updateStock(item) {
......@@ -678,6 +686,9 @@ export default {
.w350{
width: 350px;
}
.mr4{
margin-right: 4px;
}
.tab-top {
height: 32px;
margin: 20px 20px 0px 20px;
......@@ -703,9 +714,9 @@ export default {
.text {
display: inline-block;
vertical-align: top;
width: 75%;
width: 74%;
height: 60px;
margin-left: 3px;
margin-left: 10px;
font-size: 13px;
line-height: 14px;
position: relative;
......@@ -773,4 +784,9 @@ export default {
.stock-box .el-tooltip__popper{
width: 150px;
}
.popver-button .cancle-button:hover{
color: #2f54eb;
border-color: #2f54eb;
background-color: #fff;
}
</style>
\ No newline at end of file
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