Skip to content

W
welfare
Commit e1fa1786 by 萱草
Options

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

# Conflicts:
#	dist/css/chunk-055e7b5b.85a96538.css
#	dist/css/chunk-47f8737e.b4f49a30.css
#	dist/css/chunk-9829e680.b4f49a30.css
#	dist/index.html
#	dist/js/app.38f86bdb.js
#	dist/js/app.d7421689.js
#	dist/js/app.f1913f08.js
#	dist/js/card-package~gic-card.45295efb.js
#	dist/js/card-package~gic-card.4895a963.js
#	dist/js/card-package~gic-card.c7e303ef.js
#	dist/js/chunk-0d4ebdfa.e178b8db.js
#	dist/js/chunk-1006d6d9.748aa352.js
#	dist/js/chunk-14ee1b04.c4258226.js
#	dist/js/chunk-28cb370c.082ccef3.js
#	dist/js/chunk-34bff564.25d8bf94.js
#	dist/js/chunk-3dcea544.0ee04761.js
#	dist/js/chunk-40634738.20f0e58f.js
#	dist/js/chunk-40634738.8f14ad23.js
#	dist/js/chunk-40634738.a2de9b40.js
#	dist/js/chunk-47f8737e.b31f7bd2.js
#	dist/js/chunk-6287d3af.32a6c603.js
parents 118d5a1f 349ef7ca
Showing with 54 additions and 31 deletions
dist/css/card-package.7a79b96b.css → dist/css/card-package.ae700c0b.css
.ml40[data-v-4e6a2810]{margin-left:40px}.filter-block[data-v-4e6a2810]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4e6a2810]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-4e6a2810]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4e6a2810]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4e6a2810]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-328ceb6e]{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-328ceb6e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-4e6a2810]{margin-left:40px}.filter-block[data-v-4e6a2810]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4e6a2810]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-4e6a2810]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4e6a2810]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4e6a2810]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-7309a6c0]{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-7309a6c0]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-1006d6d9.76456cba.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-c90abad6]{border-color:#1890ff}.upload-ele .el-button[data-v-c90abad6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c90abad6]{padding:0}.uploadText p[data-v-c90abad6]{line-height:26px}.pickup-upload[data-v-c90abad6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-c90abad6]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-c90abad6]{font-size:14px}.pickup-upload .pickup-list[data-v-c90abad6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c90abad6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c90abad6]{font-size:14px}.w360[data-v-f84bbf9a]{width:360px}.w-160[data-v-f84bbf9a]{width:160px}.w140[data-v-f84bbf9a]{width:140px}.w350[data-v-f84bbf9a]{width:350px}.tab-top[data-v-f84bbf9a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-f84bbf9a],.tab-top[data-v-f84bbf9a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-f84bbf9a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-f84bbf9a]{height:60px}.table-content .img-text img[data-v-f84bbf9a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-f84bbf9a]{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-f84bbf9a]{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-f84bbf9a]{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-f84bbf9a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-f84bbf9a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-f84bbf9a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-f84bbf9a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-f84bbf9a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-f84bbf9a]:hover{color:#2f54ed}.undeline-dash[data-v-f84bbf9a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-f84bbf9a]{display:inline-block;line-height:32px}.hidden-data[data-v-f84bbf9a]{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-14ee1b04.6cbaa722.css deleted 100644 → 0
.step-text[data-v-7af688a6]{color:#000;font-size:14px}.dash-style[data-v-7af688a6]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-7af688a6]{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-7af688a6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-7af688a6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-7af688a6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-7af688a6]{padding:0}.w-630[data-v-7af688a6]{width:630px}.mb56[data-v-7af688a6]{margin-bottom:56px}.from-content[data-v-7af688a6]{position:relative}.from-content .demo-ruleForm .form-section[data-v-7af688a6]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-7af688a6]{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-7af688a6]: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-7af688a6]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-7af688a6]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-7af688a6]{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-7af688a6]{margin-top:12px}.from-content .anchor-link[data-v-7af688a6]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-7af688a6]{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-7af688a6]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-7af688a6]:hover{color:#2f54ed}.ml20[data-v-7af688a6]{margin-left:20px}.mr10[data-v-7af688a6]{margin-right:10px}.tips-content[data-v-7af688a6]{position:absolute;left:-4px;top:6px}.store-tips[data-v-7af688a6]{width:200px;position:absolute;left:-10px}.underline[data-v-7af688a6]{text-decoration:underline}.pickup-upload[data-v-7af688a6]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7af688a6]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7af688a6]{font-size:14px}.pickup-upload .pickup-list[data-v-7af688a6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7af688a6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7af688a6]{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-1faddb40.c9d21505.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-296b439a]{width:360px}.w-160[data-v-296b439a]{width:160px}.w140[data-v-296b439a]{width:140px}.w350[data-v-296b439a]{width:350px}.tab-top[data-v-296b439a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-296b439a],.tab-top[data-v-296b439a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-296b439a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-296b439a]{height:60px}.table-content .img-text img[data-v-296b439a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-296b439a]{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-296b439a]{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-296b439a]{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-296b439a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-296b439a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-296b439a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-296b439a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-296b439a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-296b439a]:hover{color:#2f54ed}.undeline-dash[data-v-296b439a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-296b439a]{display:inline-block;line-height:32px}.hidden-data[data-v-296b439a]{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-3dcea544.9e122310.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-1073cbec]{width:360px}.w-160[data-v-1073cbec]{width:160px}.w140[data-v-1073cbec]{width:140px}.w350[data-v-1073cbec]{width:350px}.tab-top[data-v-1073cbec]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-1073cbec],.tab-top[data-v-1073cbec]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-1073cbec]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-1073cbec]{height:60px}.table-content .img-text img[data-v-1073cbec]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-1073cbec]{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-1073cbec]{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-1073cbec]{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-1073cbec]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-1073cbec]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-1073cbec]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-1073cbec]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-1073cbec]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-1073cbec]:hover{color:#2f54ed}.undeline-dash[data-v-1073cbec]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-1073cbec]{display:inline-block;line-height:32px}.hidden-data[data-v-1073cbec]{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-4275b00a.6c8e46f5.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-c90abad6]{border-color:#1890ff}.upload-ele .el-button[data-v-c90abad6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c90abad6]{padding:0}.uploadText p[data-v-c90abad6]{line-height:26px}.pickup-upload[data-v-c90abad6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-c90abad6]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-c90abad6]{font-size:14px}.pickup-upload .pickup-list[data-v-c90abad6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c90abad6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c90abad6]{font-size:14px}.w360[data-v-554c14f5]{width:360px}.w-160[data-v-554c14f5]{width:160px}.w140[data-v-554c14f5]{width:140px}.w350[data-v-554c14f5]{width:350px}.tab-top[data-v-554c14f5]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-554c14f5],.tab-top[data-v-554c14f5]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-554c14f5]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-554c14f5]{height:60px}.table-content .img-text img[data-v-554c14f5]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-554c14f5]{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-554c14f5]{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-554c14f5]{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-554c14f5]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-554c14f5]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-554c14f5]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-554c14f5]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-554c14f5]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-554c14f5]:hover{color:#2f54ed}.undeline-dash[data-v-554c14f5]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-554c14f5]{display:inline-block;line-height:32px}.hidden-data[data-v-554c14f5]{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-a49129fc.453b6cf9.css 0 → 100644
.step-text[data-v-c6d87fc4]{color:#000;font-size:14px}.dash-style[data-v-c6d87fc4]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-c6d87fc4]{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-c6d87fc4]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-c6d87fc4]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-c6d87fc4]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c6d87fc4]{padding:0}.w-630[data-v-c6d87fc4]{width:630px}.mb56[data-v-c6d87fc4]{margin-bottom:56px}.from-content[data-v-c6d87fc4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-c6d87fc4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-c6d87fc4]{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-c6d87fc4]: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-c6d87fc4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-c6d87fc4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-c6d87fc4]{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-c6d87fc4]{margin-top:12px}.from-content .anchor-link[data-v-c6d87fc4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-c6d87fc4]{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-c6d87fc4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-c6d87fc4]:hover{color:#2f54ed}.ml20[data-v-c6d87fc4]{margin-left:20px}.mr10[data-v-c6d87fc4]{margin-right:10px}.tips-content[data-v-c6d87fc4]{position:absolute;left:-4px;top:6px}.store-tips[data-v-c6d87fc4]{width:200px;position:absolute;left:-10px}.underline[data-v-c6d87fc4]{text-decoration:underline}.pickup-upload[data-v-c6d87fc4]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-c6d87fc4]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-c6d87fc4]{font-size:14px}.pickup-upload .pickup-list[data-v-c6d87fc4]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c6d87fc4]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c6d87fc4]{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/js/chunk-0d4ebdfa.c104ece2.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[i("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),i("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),i("el-table-column",{attrs:{prop:"address",label:"地址"}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?i("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n ")]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("/setting/address-lib-add?id="+e.row.addressId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=i("fab6"),o=i("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,i=t.addressId;this.loading=!0,d({addressId:i}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=i("2877"),u=Object(p["a"])(c,a,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("ade3"),s=i("71f6"),r=i("f121");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function n(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"],r["c"].api,r["f"]},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return o}));var a=i("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-0d4ebdfa.e178b8db.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("div",{staticClass:"pb20 clearfix flex-center"},[a("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),a("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[a("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),a("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),a("el-table-column",{attrs:{prop:"address",label:"地址"}}),a("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?a("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n ")]}}])}),a("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.$router.push("/setting/address-lib-add?id="+e.row.addressId)}}},[t._v("编辑")]),a("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(a){return t.del(e.row)}}},[a("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=a("fab6"),o=a("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,a=t.addressId;this.loading=!0,d({addressId:a}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=a("2877"),u=Object(p["a"])(c,i,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return c}));a("8e6e"),a("ac6a"),a("456d");var i=a("ade3"),s=a("71f6"),r=a("f121");function o(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,i)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?o(Object(a),!0).forEach((function(e){Object(i["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):o(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"];var c=r["c"].api+r["f"]+"/export-pickup-store-excel"},fab6:function(t,e,a){"use strict";a.d(e,"c",(function(){return s})),a.d(e,"a",(function(){return r})),a.d(e,"b",(function(){return o}));var i=a("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(i["e"])(this[s][0],a),this.listParams[e]=Object(i["e"])(this[s][1],a)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-34bff564.25d8bf94.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-34bff564.fc5afe0d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-6287d3af.32a6c603.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return l}));a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function c(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},n={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};p=Object(i["a"])(p,o["f"]),n=Object(i["a"])(n,o["f"]),e["a"]=c(c({},p),n);o["c"].api,o["b"];var l=o["c"].api+o["f"]+"/export-pickup-store-excel"},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),c=a("cdc8");function p(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?p(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):p(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var l=c["a"].updateConfig,d=c["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,l({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=n(n({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file
dist/js/chunk-6287d3af.fa4fbc54.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function p(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var c={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};c=Object(i["a"])(c,o["f"]),l=Object(i["a"])(l,o["f"]),e["a"]=p(p({},c),l);o["c"].api,o["b"],o["c"].api,o["f"]},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),p=a("cdc8");function c(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function l(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?c(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):c(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var n=p["a"].updateConfig,d=p["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,n({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=l(l({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ 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.924cdf6e.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.bf83f2eb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api/gift.js
......@@ -107,6 +107,7 @@ let setting = {
method: 'post',
headers: { 'Content-Type': 'application/json' }
},
exportPickup: '/export-pickup-store-excel'
};
realGift = getFetch(realGift, welfarePrefix);
setting = getFetch(setting, welfarePrefix);
......
src/views/gift-manage/module/check-upload-detail.vue
......@@ -5,7 +5,7 @@
<div v-html="template" style="font-size:12px;line-height:22px"></div>
</div>
<div>
<el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
<el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getTableList" @clear="getTableList"></el-input>
</div>
<el-table :data="tableData" class="mt20">
<el-table-column label="卡号" prop="paramOne"></el-table-column>
......@@ -52,7 +52,8 @@ export default {
pageSize: 10,
total: '',
tableData: [],
template: ''
template: '',
search: ''
};
},
mounted() {
......@@ -69,7 +70,7 @@ export default {
this.loading = true;
let params = {
id: this.giftId,
key: '',
key: this.search,
pageSize: this.pageSize,
currentPage: this.currentPage
};
......
src/views/gift-manage/pickup-list.vue
......@@ -37,9 +37,10 @@
<script>
import { page } from '@/mixins/table.js';
import fetch, { exportPickupStoreExcel } from '@/api/gift.js';
// import fetch, { exportPickupStoreExcel } from '@/api/gift.js';
import fetch from '@/api/gift.js';
import pickupUpdateDialog from './module/pickup-update-dialog';
const { pickupList, delPickup } = fetch;
const { pickupList, delPickup, exportPickup } = fetch;
export default {
name: 'PickupList',
components: { pickupUpdateDialog },
......@@ -71,9 +72,17 @@ export default {
},
methods: {
exportExcel() {
exportPickupStoreExcel;
// exportPickupStoreExcel;
// window.location = exportPickupStoreExcel + `?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
window.location = `https://four.gicdev.com/api-welfare/export-pickup-store-excel?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
// window.location = `https://four.gicdev.com/api-welfare/export-pickup-store-excel?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
let params = {
dataUrl: '/welfare/setting/pickup-list',
name: this.listParams.name
};
exportPickup(params).then(res =>{
window.location.href = window.location.origin + '/damo-system/report-list';
// window.location.href = 'https://four.gicdev.com/damo-system/report-list';
});
},
mutiUpdate() {
this.selectList = [];
......
src/views/gift-manage/real-gift-detail.vue
......@@ -555,7 +555,7 @@ export default {
this.goodsForm.giftNo = resResult.giftNo; // 礼品编码
this.goodsForm.giftBarNo = resResult.giftBarNo; // 礼品条形码
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
this.goodsForm.operAuthPre = resResult.operAuth ? resResult.operAuth.split(',') : [];
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '0' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.deliveryType = resResult.deliveryType;
if(this.goodsForm.deliveryType == '1,2'){
......
src/views/gift-manage/real-gift.vue
......@@ -5,7 +5,7 @@
<div>
<div class="tab-top">
<div class="fl">
<el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList">
<el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList2">
<el-select v-model="query.type" slot="prepend" placeholder="礼品名称" style="width:140px;" @change="handleChangeType">
<el-option label="礼品名称" :value="1"></el-option>
<el-option label="礼品编码" :value="2"></el-option>
......@@ -280,6 +280,11 @@ export default {
this.query.currentPage = 1;
this.getTableList();
},
getSearchList2() {
this.query.type = 1;
this.query.currentPage = 1;
this.getTableList();
},
// 列表筛选条件更改
handleChangeType() {
if (this.query.type === 1) {
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -51,8 +51,8 @@
<el-form-item label="发货内容" required prop="template">
<template>
<div style="display:flex;">
<dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="$route.query.giftId != ''"></dm-editor>
<!-- <dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="false"></dm-editor> -->
<dm-editor width="500" height="300" :value="goodsForm.template" :placeholder="template" @change="handleChange2" :readonly="$route.query.giftId != ''"></dm-editor>
<!-- <dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="$route.query.giftId != ''"></dm-editor> -->
<div class="ml20">
<p>用户申请履约后，发货内容将自动发送。</p>
<div style="height: 250px;" class="step-style">
......@@ -145,12 +145,12 @@
</el-form-item>
</div>
<div class="fixed-btn">
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-if="giftId">保存</dm-perm-button>
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</dm-perm-button>
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</dm-perm-button>
</div>
</el-form>
</div>
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId" :is-edit="true"></check-upload-detail>
<check-upload-detail v-if="dialogVisible" @closeUploadDetail="closeUploadDetail" :dialog-id="dialogId" :is-edit="true"></check-upload-detail>
</div>
</template>
<script>
......@@ -166,7 +166,7 @@ const {
getGiftId,
// getOperatorList,
giftTemplateDownload } = api;
import checkUploadDetail from './module/check-upload-detail';
import checkUploadDetail from './module/check-upload-detail.vue';
export default {
components: {
// importCoupon
......@@ -508,7 +508,7 @@ export default {
this.goodsForm.virCostPrice = resResult.virCostPrice.toFixed(2);
this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
this.goodsForm.operAuthPre = resResult.operAuth ? resResult.operAuth.split(',') : [];
// this.goodsForm.shopCodeList = resResult.shopId; // 操作人权限code
this.goodsForm.template = resResult.template; // 虚拟礼品模板
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '0' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
......
src/views/gift-manage/virtual-gift.vue
......@@ -5,7 +5,7 @@
<div>
<div class="tab-top">
<div class="fl">
<el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList">
<el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList2">
<el-select v-model="query.type" slot="prepend" placeholder="礼品名称" style="width:140px;" @change="handleChangeType">
<el-option label="礼品名称" :value="1"></el-option>
<el-option label="礼品编码" :value="2"></el-option>
......@@ -305,7 +305,12 @@ export default {
this.getTableList();
},
getSearchList() {
this.currentPage = 1;
this.query.currentPage = 1;
this.getTableList();
},
getSearchList2() {
this.query.type = 1;
this.query.currentPage = 1;
this.getTableList();
},
// 列表筛选条件更改
......@@ -411,8 +416,10 @@ export default {
}
if (value.prop === 'updateTime') {
this.query.sortColumn = 'update_time';
} else if (value.prop === 'costPrice') {
this.query.sortColumn = 'cost_price';
} else if (value.prop === 'costPrice' && value.order == 'ascending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'costPrice' && value.order == 'descending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'stock') {
this.query.sortColumn = 'stock';
}
......
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