Skip to content

W
welfare
Commit ba1edf5d by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/css/chunk-17c54ae6.5c53fbda.css
#	dist/index.html
#	dist/js/app.6cfa54a6.js
#	dist/js/chunk-1757828d.5cd3daf0.js
#	dist/js/chunk-1a5794e5.31c5f364.js
#	dist/js/chunk-350bdb36.7691edfe.js
#	dist/js/chunk-4e9587fb.5fecd04c.js
#	dist/js/chunk-6d4a4dcb.c1547088.js
#	dist/js/chunk-baa9477a.d932c052.js
#	dist/js/chunk-bb542da4.34177fad.js
#	dist/js/chunk-bb542da4.a1092816.js
#	dist/js/chunk-fa0c526e.dfba9c8b.js
#	dist/js/chunk-fa0c526e.e57e6593.js
#	public/index.html
parents e6a98263 685e5733
Showing with 45 additions and 28 deletions
dist/css/chunk-1a5794e5.f846e45d.css deleted 100644 → 0
.step-text[data-v-12f6f60a]{color:#000;font-size:14px}.dash-style[data-v-12f6f60a]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-12f6f60a]{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-12f6f60a]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-12f6f60a]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-12f6f60a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-12f6f60a]{padding:0}.w-630[data-v-12f6f60a]{width:630px}.mb56[data-v-12f6f60a]{margin-bottom:56px}.from-content[data-v-12f6f60a]{position:relative}.from-content .demo-ruleForm .form-section[data-v-12f6f60a]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-12f6f60a]{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-12f6f60a]: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-12f6f60a]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-12f6f60a]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-12f6f60a]{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-12f6f60a]{margin-top:12px}.from-content .anchor-link[data-v-12f6f60a]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-12f6f60a]{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-12f6f60a]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-12f6f60a]:hover{color:#2f54ed}.ml20[data-v-12f6f60a]{margin-left:20px}.mr10[data-v-12f6f60a]{margin-right:10px}.tips-content[data-v-12f6f60a]{position:absolute;left:-4px;top:6px}.store-tips[data-v-12f6f60a]{width:200px;position:absolute;left:-10px}.underline[data-v-12f6f60a]{text-decoration:underline}.pickup-upload[data-v-12f6f60a]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-12f6f60a]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-12f6f60a]{font-size:14px}.pickup-upload .pickup-list[data-v-12f6f60a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-12f6f60a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-12f6f60a]{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-2169db07.f8f1807d.css 0 → 100644
.step-text[data-v-6e68be9d]{color:#000;font-size:14px}.dash-style[data-v-6e68be9d]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-6e68be9d]{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-6e68be9d]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-6e68be9d]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-6e68be9d]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-6e68be9d]{padding:0}.w-630[data-v-6e68be9d]{width:630px}.mb56[data-v-6e68be9d]{margin-bottom:56px}.from-content[data-v-6e68be9d]{position:relative}.from-content .demo-ruleForm .form-section[data-v-6e68be9d]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-6e68be9d]{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-6e68be9d]: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-6e68be9d]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-6e68be9d]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-6e68be9d]{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-6e68be9d]{margin-top:12px}.from-content .anchor-link[data-v-6e68be9d]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-6e68be9d]{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-6e68be9d]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-6e68be9d]:hover{color:#2f54ed}.ml20[data-v-6e68be9d]{margin-left:20px}.mr10[data-v-6e68be9d]{margin-right:10px}.tips-content[data-v-6e68be9d]{position:absolute;left:-4px;top:6px}.store-tips[data-v-6e68be9d]{width:200px;position:absolute;left:-10px}.underline[data-v-6e68be9d]{text-decoration:underline}.pickup-upload[data-v-6e68be9d]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-6e68be9d]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-6e68be9d]{font-size:14px}.pickup-upload .pickup-list[data-v-6e68be9d]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-6e68be9d]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-6e68be9d]{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-2a5eecda.094d0869.css 0 → 100644
.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-6848d0ea]{width:360px}.w-160[data-v-6848d0ea]{width:160px}.w140[data-v-6848d0ea]{width:140px}.w350[data-v-6848d0ea]{width:350px}.tab-top[data-v-6848d0ea]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-6848d0ea],.tab-top[data-v-6848d0ea]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-6848d0ea]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-6848d0ea]{height:60px}.table-content .img-text img[data-v-6848d0ea]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-6848d0ea]{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-6848d0ea]{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-6848d0ea]{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-6848d0ea]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-6848d0ea]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-6848d0ea]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-6848d0ea]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-6848d0ea]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-6848d0ea]:hover{color:#2f54ed}.undeline-dash[data-v-6848d0ea]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-6848d0ea]{display:inline-block;line-height:32px}.hidden-data[data-v-6848d0ea]{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-2e6464ca.bc9a7b27.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-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-5fd264d5]{width:360px}.w-160[data-v-5fd264d5]{width:160px}.w140[data-v-5fd264d5]{width:140px}.w350[data-v-5fd264d5]{width:350px}.tab-top[data-v-5fd264d5]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-5fd264d5],.tab-top[data-v-5fd264d5]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-5fd264d5]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-5fd264d5]{height:60px}.table-content .img-text img[data-v-5fd264d5]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-5fd264d5]{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-5fd264d5]{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-5fd264d5]{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-5fd264d5]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-5fd264d5]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-5fd264d5]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-5fd264d5]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-5fd264d5]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-5fd264d5]:hover{color:#2f54ed}.undeline-dash[data-v-5fd264d5]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-5fd264d5]{display:inline-block;line-height:32px}.hidden-data[data-v-5fd264d5]{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-6d4a4dcb.fec0806b.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-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-735a576f]{width:360px}.w-160[data-v-735a576f]{width:160px}.w140[data-v-735a576f]{width:140px}.w350[data-v-735a576f]{width:350px}.tab-top[data-v-735a576f]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-735a576f],.tab-top[data-v-735a576f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-735a576f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-735a576f]{height:60px}.table-content .img-text img[data-v-735a576f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-735a576f]{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-735a576f]{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-735a576f]{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-735a576f]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-735a576f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-735a576f]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-735a576f]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-735a576f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-735a576f]:hover{color:#2f54ed}.undeline-dash[data-v-735a576f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-735a576f]{display:inline-block;line-height:32px}.hidden-data[data-v-735a576f]{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-baa9477a.f5adea56.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-f16dc7d2]{width:360px}.w-160[data-v-f16dc7d2]{width:160px}.w140[data-v-f16dc7d2]{width:140px}.w350[data-v-f16dc7d2]{width:350px}.tab-top[data-v-f16dc7d2]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-f16dc7d2],.tab-top[data-v-f16dc7d2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-f16dc7d2]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-f16dc7d2]{height:60px}.table-content .img-text img[data-v-f16dc7d2]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-f16dc7d2]{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-f16dc7d2]{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-f16dc7d2]{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-f16dc7d2]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-f16dc7d2]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-f16dc7d2]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-f16dc7d2]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-f16dc7d2]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-f16dc7d2]:hover{color:#2f54ed}.undeline-dash[data-v-f16dc7d2]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-f16dc7d2]{display:inline-block;line-height:32px}.hidden-data[data-v-f16dc7d2]{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/gic-card.211e2b61.css deleted 100644 → 0
[data-v-31ef4600] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-31ef4600] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-31ef4600]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-31ef4600]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-31ef4600]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-31ef4600]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-31ef4600]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-31ef4600]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-31ef4600]{margin-left:40px}.filter-block[data-v-31ef4600]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-31ef4600]{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-5dfc879c]{margin-top:8px}.cardForm[data-v-5dfc879c]{padding:30px 20px}.cardForm .w165[data-v-5dfc879c]{width:165px!important}.cardForm .w265[data-v-5dfc879c]{width:265px!important}.cardForm .tips[data-v-5dfc879c]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-5dfc879c]{margin:20px auto 48px}.cardForm[data-v-5dfc879c] .el-form .el-input-number .el-input,.cardForm[data-v-5dfc879c] .el-form .el-select .el-input{width:100%}.cardForm[data-v-5dfc879c] .el-form .w260,.w260[data-v-5dfc879c] input,.w260[data-v-5dfc879c] textarea{width:260px}.cardEffectiveMode1[data-v-5dfc879c]{position:relative}.cardEffectiveMode1-time[data-v-5dfc879c]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-5dfc879c]{top:47px}.content[data-v-5dfc879c]{margin-bottom:30px}.info .row[data-v-f71e8c96] .el-form-item{margin-bottom:12px}.w500[data-v-f71e8c96] input,.w500[data-v-f71e8c96] textarea{width:500px}.card-info[data-v-f71e8c96]{padding:24px 20px;position:relative}.card-info .title[data-v-f71e8c96]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-f71e8c96] .btn-area{display:none}.card-info[data-v-f71e8c96] .el-form-item__content{color:#303133}.card-info[data-v-f71e8c96] .el-form .el-input-number .el-input,.card-info[data-v-f71e8c96] .el-form .el-select .el-input{width:100%}.card-info[data-v-f71e8c96] .el-form .dm-input,.card-info[data-v-f71e8c96] .el-form .el-input,.card-info[data-v-f71e8c96] .el-form .el-input-number,.card-info[data-v-f71e8c96] .el-form .el-select,.card-info[data-v-f71e8c96] .el-form .el-textarea{width:352px}.cardSelect[data-v-a1df40ea] .el-button{width:350px!important}.cardSelect[data-v-a1df40ea] .reveal .card img.flag{display:none}[data-v-a1df40ea] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-a1df40ea] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/css/gic-card.c2c11b9f.css 0 → 100644
[data-v-31ef4600] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-31ef4600] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-31ef4600]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-31ef4600]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-31ef4600]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-31ef4600]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-31ef4600]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-31ef4600]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-31ef4600]{margin-left:40px}.filter-block[data-v-31ef4600]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-31ef4600]{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(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAYAAAB8OZQwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEYyRkY1NkUxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEYyRkY1NkYxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0RjJGRjU2QzFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0RjJGRjU2RDFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ph7O54QAAABGSURBVHjaYvrx48cvID4JxFH///9nAGEGIOc/Ep4KEmQEcRhQQTQTAybIxyZoiE2QAZvgeWyCE9EFp7Gzsy9jwOZ4gAADABluO3AWsN5PAAAAAElFTkSuQmCC) 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-5dfc879c]{margin-top:8px}.cardForm[data-v-5dfc879c]{padding:30px 20px}.cardForm .w165[data-v-5dfc879c]{width:165px!important}.cardForm .w265[data-v-5dfc879c]{width:265px!important}.cardForm .tips[data-v-5dfc879c]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-5dfc879c]{margin:20px auto 48px}.cardForm[data-v-5dfc879c] .el-form .el-input-number .el-input,.cardForm[data-v-5dfc879c] .el-form .el-select .el-input{width:100%}.cardForm[data-v-5dfc879c] .el-form .w260,.w260[data-v-5dfc879c] input,.w260[data-v-5dfc879c] textarea{width:260px}.cardEffectiveMode1[data-v-5dfc879c]{position:relative}.cardEffectiveMode1-time[data-v-5dfc879c]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-5dfc879c]{top:47px}.content[data-v-5dfc879c]{margin-bottom:30px}.info .row[data-v-f71e8c96] .el-form-item{margin-bottom:12px}.w500[data-v-f71e8c96] input,.w500[data-v-f71e8c96] textarea{width:500px}.card-info[data-v-f71e8c96]{padding:24px 20px;position:relative}.card-info .title[data-v-f71e8c96]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-f71e8c96] .btn-area{display:none}.card-info[data-v-f71e8c96] .el-form-item__content{color:#303133}.card-info[data-v-f71e8c96] .el-form .el-input-number .el-input,.card-info[data-v-f71e8c96] .el-form .el-select .el-input{width:100%}.card-info[data-v-f71e8c96] .el-form .dm-input,.card-info[data-v-f71e8c96] .el-form .el-input,.card-info[data-v-f71e8c96] .el-form .el-input-number,.card-info[data-v-f71e8c96] .el-form .el-select,.card-info[data-v-f71e8c96] .el-form .el-textarea{width:352px}.cardSelect[data-v-a1df40ea] .el-button{width:350px!important}.cardSelect[data-v-a1df40ea] .reveal .card img.flag{display:none}[data-v-a1df40ea] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-a1df40ea] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/js/chunk-vendors.4a0b36ab.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.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.327ffbb7.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.3aa1240e.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -47,7 +47,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/app-info.1.0.5.js"></script><!-- 应用信息 -->
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.10.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.11.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.7.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
......
src/views/gift-manage/module/update-real-stock.vue
......@@ -20,7 +20,7 @@
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="banthStock" width="140" style="margin-left:-2px;" controls-position="right" precision="2" :min="0" :max="999999.99"></dm-input-number>
<dm-input-number v-model="banthStock" width="140" style="margin-left:-2px;" controls-position="right" precision="0" :min="0" :max="999999"></dm-input-number>
</div>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small">取消</el-button>
......@@ -36,7 +36,7 @@
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="skuSellObj[scope.row.mapId].stageStock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].stageStock, skuSellObj[scope.row.mapId].stockType)" precision="2" :min="0" :max="999999.99"></dm-input-number>
<dm-input-number v-model="skuSellObj[scope.row.mapId].stageStock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].stageStock, skuSellObj[scope.row.mapId].stockType)" precision="0" :min="0" :max="999999"></dm-input-number>
</template>
</el-table-column>
</el-table>
......@@ -48,7 +48,7 @@
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="stock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(giftSkuId, stock, stockType)" precision="2" :min="0" :max="999999.99"></dm-input-number>
<dm-input-number v-model="stock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(giftSkuId, stock, stockType)" precision="0" :min="0" :max="999999"></dm-input-number>
</template>
</el-form-item>
</el-form>
......
src/views/gift-manage/real-gift.vue
......@@ -126,7 +126,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="allExchangeNumber" label="总出库量" min-width="100px">
<el-table-column prop="totalStock" label="总出库量" min-width="100px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">总出库量</span>
......@@ -139,7 +139,7 @@
</el-tooltip>
</template>
<template slot-scope="scope">
<span>{{ scope.row.historyTotalStock }}</span>
<span>{{ scope.row.totalOutStock || '--' }}</span>
</template>
</el-table-column>
<el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -249,7 +249,13 @@ export default {
image: [],
uploadFile: {
name: ''
}
},
correct: false,
correct1: true,
correct2: true,
correct3: true,
correct4: true,
template2: ''
};
},
mounted() {
......@@ -310,9 +316,14 @@ export default {
downloadFile() {
if(!this.isEdit){
this.saveDescription();
if(this.correct){
const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
}
}else{
const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
}
const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
},
// uploadChange(file){
// console.log(file);
......@@ -333,11 +344,15 @@ export default {
// },
handleChange2(value){
this.goodsForm.template = value;
this.correct = false;
this.correct1 = true;
this.correct2 = true;
this.correct3 = true;
this.correct4 = true;
// console.log(this.goodsForm.giftDescrption);
},
// 保存发货内容 校验
saveDescription(){
this.isSave = true;
let index = this.goodsForm.template.indexOf('{'); // 字符出现的位置
let templatePre = this.goodsForm.template.split(''); // 处理{ 后的数据
templatePre.splice(index + 1, 0, '<span style="text-decoration: underline">');
......@@ -373,7 +388,7 @@ export default {
indexCopy = this.goodsForm.template.indexOf('{', indexCopy + 1);
if(indexCopy - indexCopyLate == 42){
this.$message.error('{}不能嵌套出现');
this.isSave = false;
this.correct1 = false;
};
indexCopyLate = indexCopy;
}
......@@ -382,17 +397,21 @@ export default {
index2Copy = this.goodsForm.template.indexOf('}', index2Copy + 1);
if(index2Copy - index2CopyLate == 8){
this.$message.error('{}不能嵌套出现');
this.isSave = false;
this.correct2 = false;
};
index2CopyLate = index2Copy;
}
if(num !== num2 || num > 3 || num2 > 3){
this.$message.error('请填写正确的格式');
this.isSave = false;
this.correct3 = false;
};
// if(this.isSave){
// this.generateTemplate();
// }
if(num === 0 || num2 === 0){
this.$message.error('请填写正确的格式');
this.correct4 = false;
};
if(this.correct1 && this.correct2 && this.correct3 && this.correct4){
this.correct = true;
}
},
// 生成模板
// generateTemplate(){
......@@ -457,9 +476,6 @@ export default {
this.goodsForm.stock = resResult.stock;
this.goodsForm.giftBarNo = resResult.giftBarNo;
this.goodsForm.virCostPrice = resResult.virCostPrice;
// this.goodsForm.tableData[0].giftNo = resResult.giftNo;
// this.goodsForm.tableData[0].stock = resResult.stock;
// this.goodsForm.tableData[0].giftBarNo = resResult.giftBarNo;
this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
......@@ -587,6 +603,7 @@ export default {
// params.giftId = '';
giftSave(params).then(res =>{
if (res.code === '0000') {
this.$store.commit('updateShowCornerCanUseApp', true);
this.$router.push({ path: '/gift-manage/virtual-gift' });
this.btnLoading = false;
} else {
......
src/views/gift-manage/virtual-gift.vue
......@@ -139,7 +139,7 @@
</el-tooltip>
</template>
<template slot-scope="scope">
<span>{{ scope.row.historyTotalStock }}</span>
<span>{{ scope.row.totalOutStock || '--' }}</span>
</template>
</el-table-column>
<el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
......
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