Skip to content

W
welfare
Commit bc6c1375 by 黑潮
Options

Merge branch 'feature/福利中心-礼品管理' of git.gicdev.com:dm4/welfare into feature/福利中心-礼品管理

parents d1e4efb2 6b76e847
Showing with 263 additions and 123 deletions
dist/css/card-package.d0bf2b76.css → dist/css/card-package.5240cb39.css
.ml40[data-v-273757e6]{margin-left:40px}.filter-block[data-v-273757e6]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-273757e6]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-273757e6]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-273757e6]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-273757e6]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3278d8dd]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-3278d8dd]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-744f9835]{margin-left:40px}.filter-block[data-v-744f9835]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-744f9835]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-744f9835]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-744f9835]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-744f9835]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3278d8dd]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-3278d8dd]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/card-package~gic-card.223f94e1.css → dist/css/card-package~gic-card.b6a9cd86.css
.prepend-select[data-v-a5a3177c] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-a5a3177c] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;border-bottom:1px solid #dcdfe6;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:0;left:0;width:60px;height:60px;border-radius:4px}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
.prepend-select[data-v-9a364078] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-9a364078] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;border-bottom:1px solid #dcdfe6;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:0;left:0;width:60px;height:60px;border-radius:4px}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
dist/css/chunk-0860f57a.d0a8384e.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-60ceb8dc]{width:360px}.w-160[data-v-60ceb8dc]{width:160px}.w140[data-v-60ceb8dc]{width:140px}.w350[data-v-60ceb8dc]{width:350px}.tab-top[data-v-60ceb8dc]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-60ceb8dc],.tab-top[data-v-60ceb8dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-60ceb8dc]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-60ceb8dc]{height:60px}.table-content .img-text img[data-v-60ceb8dc]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-60ceb8dc]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-60ceb8dc]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-60ceb8dc]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-60ceb8dc]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-60ceb8dc]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-60ceb8dc]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-60ceb8dc]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-60ceb8dc]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-60ceb8dc]:hover{color:#2f54ed}.undeline-dash[data-v-60ceb8dc]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-60ceb8dc]{display:inline-block;line-height:32px}.hidden-data[data-v-60ceb8dc]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-08b2d41b.3fcf9c04.css deleted 100644 → 0
.empty_block[data-v-a5af4596]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-a5af4596]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-a5af4596]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-a5af4596]{display:inline-block}.logistics-info span+span[data-v-a5af4596]{margin-left:10px}.logistics-step[data-v-a5af4596]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-a5af4596]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-a5af4596]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-a5af4596]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-a5af4596]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-a5af4596]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-a5af4596]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-12a2bbcb.bde4bb10.css → dist/css/chunk-22859e34.6907d90c.css
[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.empty_block[data-v-c46fc112]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-c46fc112]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-c46fc112]{display:inline-block}.logistics-info span+span[data-v-c46fc112]{margin-left:10px}.logistics-step[data-v-c46fc112]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-c46fc112]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-c46fc112]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-c46fc112]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-c46fc112]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-c46fc112]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-0088e0a8]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-0088e0a8]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-0088e0a8]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-0088e0a8]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-0088e0a8]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-8e62a21a]{color:#faad14;font-size:21px}.empty_block[data-v-c46fc112]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-c46fc112]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-c46fc112]{display:inline-block}.logistics-info span+span[data-v-c46fc112]{margin-left:10px}.logistics-step[data-v-c46fc112]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-c46fc112]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-c46fc112]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-c46fc112]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-c46fc112]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-c46fc112]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5563ffd2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5563ffd2]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-761dda23]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-761dda23]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-761dda23]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-761dda23]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-761dda23]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
dist/css/chunk-28cb370c.c4067039.css deleted 100644 → 0
.w-280[data-v-1b2ddbf4]{width:280px}
\ No newline at end of file
dist/css/chunk-3a00490d.25bb4e21.css 0 → 100644
.step-text[data-v-cba8a022]{color:#000;font-size:14px}.dash-style[data-v-cba8a022]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-cba8a022]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-cba8a022]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-cba8a022]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-cba8a022]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-cba8a022]{padding:0}.w-630[data-v-cba8a022]{width:630px}.mb56[data-v-cba8a022]{margin-bottom:56px}.from-content[data-v-cba8a022]{position:relative}.from-content .demo-ruleForm .form-section[data-v-cba8a022]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-cba8a022]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-cba8a022]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-cba8a022]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-cba8a022]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-cba8a022]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-cba8a022]{margin-top:12px}.from-content .anchor-link[data-v-cba8a022]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-cba8a022]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-cba8a022]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-cba8a022]:hover{color:#2f54ed}.ml20[data-v-cba8a022]{margin-left:20px}.mr10[data-v-cba8a022]{margin-right:10px}.tips-content[data-v-cba8a022]{position:absolute;left:-4px;top:6px}.store-tips[data-v-cba8a022]{width:200px;position:absolute;left:-10px}.underline[data-v-cba8a022]{text-decoration:underline}.pickup-upload[data-v-cba8a022]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-cba8a022]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-cba8a022]{font-size:14px}.pickup-upload .pickup-list[data-v-cba8a022]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-cba8a022]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-cba8a022]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-3ab2cf8c.111b794e.css deleted 100644 → 0
.w-280[data-v-1b2ddbf4]{width:280px}.w600[data-v-bc9361d6]{width:600px}
\ No newline at end of file
dist/css/chunk-3fcbab70.7f0a1076.css 0 → 100644
.empty_block[data-v-dfb28340]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-dfb28340]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-dfb28340]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-dfb28340]{display:inline-block}.logistics-info span+span[data-v-dfb28340]{margin-left:10px}.logistics-step[data-v-dfb28340]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-dfb28340]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-dfb28340]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-dfb28340]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-dfb28340]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-dfb28340]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-dfb28340]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-51f3e04f.c1d0a988.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-357df7d2]{width:360px}.w-160[data-v-357df7d2]{width:160px}.w140[data-v-357df7d2]{width:140px}.w350[data-v-357df7d2]{width:350px}.tab-top[data-v-357df7d2]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-357df7d2],.tab-top[data-v-357df7d2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-357df7d2]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-357df7d2]{height:60px}.table-content .img-text img[data-v-357df7d2]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-357df7d2]{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-357df7d2]{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-357df7d2]{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-357df7d2]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-357df7d2]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-357df7d2]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-357df7d2]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-357df7d2]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-357df7d2]:hover{color:#2f54ed}.undeline-dash[data-v-357df7d2]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-357df7d2]{display:inline-block;line-height:32px}.hidden-data[data-v-357df7d2]{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-5d5bbb0f.7a2343bb.css 0 → 100644
.w-480[data-v-2c5a0676]{width:480px}
\ No newline at end of file
dist/css/chunk-9b9ebe6a.47af1273.css 0 → 100644
.w-280[data-v-2890cc04]{width:280px}.w600[data-v-51f73c4f]{width:600px}.title[data-v-51f73c4f]{height:40px;line-height:40px;background:#f7f8fa}.title[data-v-51f73c4f]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}
\ No newline at end of file
dist/css/chunk-9e7ba7ac.e2d1f57b.css deleted 100644 → 0
.step-text[data-v-b6d548a4]{color:#000;font-size:14px}.dash-style[data-v-b6d548a4]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-b6d548a4]{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-b6d548a4]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-b6d548a4]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-b6d548a4]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-b6d548a4]{padding:0}.w-630[data-v-b6d548a4]{width:630px}.mb56[data-v-b6d548a4]{margin-bottom:56px}.from-content[data-v-b6d548a4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-b6d548a4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-b6d548a4]{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-b6d548a4]: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-b6d548a4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-b6d548a4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-b6d548a4]{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-b6d548a4]{margin-top:12px}.from-content .anchor-link[data-v-b6d548a4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-b6d548a4]{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-b6d548a4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-b6d548a4]:hover{color:#2f54ed}.ml20[data-v-b6d548a4]{margin-left:20px}.mr10[data-v-b6d548a4]{margin-right:10px}.tips-content[data-v-b6d548a4]{position:absolute;left:-4px;top:6px}.store-tips[data-v-b6d548a4]{width:200px;position:absolute;left:-10px}.underline[data-v-b6d548a4]{text-decoration:underline}.pickup-upload[data-v-b6d548a4]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-b6d548a4]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-b6d548a4]{font-size:14px}.pickup-upload .pickup-list[data-v-b6d548a4]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-b6d548a4]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-b6d548a4]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-a3d44a22.669940f7.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-30465c69]{border-color:#1890ff}.upload-ele .el-button[data-v-30465c69]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-30465c69]{padding:0}.uploadText p[data-v-30465c69]{line-height:26px}.pickup-upload[data-v-30465c69]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-30465c69]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-30465c69]{font-size:14px}.pickup-upload .pickup-list[data-v-30465c69]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-30465c69]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-30465c69]{font-size:14px}.w360[data-v-093160e1]{width:360px}.w-160[data-v-093160e1]{width:160px}.w140[data-v-093160e1]{width:140px}.w350[data-v-093160e1]{width:350px}.tab-top[data-v-093160e1]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-093160e1],.tab-top[data-v-093160e1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-093160e1]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-093160e1]{height:60px}.table-content .img-text img[data-v-093160e1]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-093160e1]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-093160e1]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-093160e1]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-093160e1]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-093160e1]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-093160e1]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-093160e1]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-093160e1]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-093160e1]:hover{color:#2f54ed}.undeline-dash[data-v-093160e1]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-093160e1]{display:inline-block;line-height:32px}.hidden-data[data-v-093160e1]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-cc768a6e.a6cd210f.css 0 → 100644
.w-280[data-v-2890cc04]{width:280px}
\ No newline at end of file
dist/css/chunk-474caa97.19a10178.css → dist/css/chunk-cfac6e50.4edf6a44.css
.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.empty_block[data-v-aef9879e]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-aef9879e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-aef9879e]{display:inline-block}.logistics-info span+span[data-v-aef9879e]{margin-left:10px}.logistics-step[data-v-aef9879e]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-aef9879e]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-aef9879e]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-aef9879e]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-aef9879e]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-aef9879e]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.order-info[data-v-1bb9bb28]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-1bb9bb28]{width:33%;margin:10px 0}.delivery-complete[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:20px}.delivery-complete .el-icon-success[data-v-1bb9bb28]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-1bb9bb28]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-1bb9bb28]{margin-top:16px;color:#606266}.delivery-complete p[data-v-1bb9bb28]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.delivery-todo .status-text[data-v-1bb9bb28]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-1bb9bb28]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-1bb9bb28]{width:100%;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.delivery-todo .status .time[data-v-1bb9bb28]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-1bb9bb28]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:24px;width:24px;background-color:#2f54eb;color:#fff;border-radius:50%;-ms-flex-negative:0;flex-shrink:0}.delivery-todo .status i[data-v-1bb9bb28]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-1bb9bb28]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-1bb9bb28]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file
.el-icon-warning[data-v-8e62a21a]{color:#faad14;font-size:21px}.write-off[data-v-5563ffd2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5563ffd2]{margin-top:20px;color:#f5222d;font-size:20px}.empty_block[data-v-aef9879e]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-aef9879e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-aef9879e]{display:inline-block}.logistics-info span+span[data-v-aef9879e]{margin-left:10px}.logistics-step[data-v-aef9879e]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-aef9879e]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-aef9879e]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-aef9879e]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-aef9879e]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-aef9879e]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.order-info[data-v-1bb9bb28]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-1bb9bb28]{width:33%;margin:10px 0}.delivery-complete[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:20px}.delivery-complete .el-icon-success[data-v-1bb9bb28]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-1bb9bb28]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-1bb9bb28]{margin-top:16px;color:#606266}.delivery-complete p[data-v-1bb9bb28]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.delivery-todo .status-text[data-v-1bb9bb28]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-1bb9bb28]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-1bb9bb28]{width:100%;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.delivery-todo .status .time[data-v-1bb9bb28]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-1bb9bb28]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:24px;width:24px;background-color:#2f54eb;color:#fff;border-radius:50%;-ms-flex-negative:0;flex-shrink:0}.delivery-todo .status i[data-v-1bb9bb28]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-1bb9bb28]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-1bb9bb28]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file
dist/css/chunk-e34bb126.fd1824c3.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-4f27e20e]{border-color:#1890ff}.upload-ele .el-button[data-v-4f27e20e]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-4f27e20e]{padding:0}.uploadText p[data-v-4f27e20e]{line-height:26px}.pickup-upload[data-v-4f27e20e]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-4f27e20e]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-4f27e20e]{font-size:14px}.pickup-upload .pickup-list[data-v-4f27e20e]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-4f27e20e]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-4f27e20e]{font-size:14px}.w360[data-v-517b8a46]{width:360px}.w-160[data-v-517b8a46]{width:160px}.w140[data-v-517b8a46]{width:140px}.w350[data-v-517b8a46]{width:350px}.tab-top[data-v-517b8a46]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-517b8a46],.tab-top[data-v-517b8a46]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-517b8a46]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-517b8a46]{height:60px}.table-content .img-text img[data-v-517b8a46]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-517b8a46]{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-517b8a46]{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-517b8a46]{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-517b8a46]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-517b8a46]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-517b8a46]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-517b8a46]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-517b8a46]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-517b8a46]:hover{color:#2f54ed}.undeline-dash[data-v-517b8a46]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-517b8a46]{display:inline-block;line-height:32px}.hidden-data[data-v-517b8a46]{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/js/chunk-0d4ebdfa.45e74929.js deleted 100644 → 0
(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-edit?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.bbc1795f.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:"地址","min-width":"120px","show-overflow-tooltip":""}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.type?"退款地址":"--")+"\n "),e.row.defaultFlag?i("el-tag",{staticClass:"ml5"},[t._v("默认")]):t._e()]}}])}),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-edit?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})))}}},p=l,c=i("2877"),u=Object(c["a"])(p,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-34bff564.d2801cb5.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-5d5bbb0f.66f4c11d.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.45090f89.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.b4587236.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.11.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.11.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/components/libs/adjust-stock.vue
......@@ -83,6 +83,7 @@ export default {
// return;
// }
const params = {
remark: this.ruleForm.remark,
optType: this.ruleForm.type, // 1: 增加; 2: 减少
count: this.ruleForm.stock // 增加或者减少数量
};
......
src/components/stock-list/index.vue
......@@ -7,7 +7,7 @@
<div>
<p class="fray01 fw500 mb15">操作记录<span class="fz12 ml15 gray03 fw400">主要对手动调整库存，应用占用库存，应用释放库存的场景下对福利“可占库存”引起变更进行记录</span></p>
<div class="mb20">
<el-select class="mr10 w160" v-if="type == 1" clearable v-model="listParams.name" placeholder="全部SKU" @change="refresh">
<el-select class="mr10 w160" v-if="type == 1" clearable v-model="listParams.welfareSkuId" placeholder="全部SKU" @change="refresh">
<el-option v-for="(item, idx) in skuList" :key="idx" :label="item.giftSkuName" :value="item.giftSkuId"></el-option>
</el-select>
<el-select class="mr10 w160" clearable v-model="listParams.modifyType" placeholder="全部操作类型" @change="refresh">
......@@ -69,9 +69,10 @@ export default {
data() {
return {
loading: false,
dateTime: [ , ],
dateTime: [ new Date() - 7 * 24 * 60 * 60 * 1000, new Date() ],
listParams: {
welfareId: this.welfareId,
welfareSkuId: '',
modifyType: '', // 调整类型(1:加，2:减)
startDate: '',
endDate: '',
......
src/components/stock-list/welfare-item.vue
......@@ -5,7 +5,7 @@
<label>福利ID：</label><span>{{ welfareId }}</span>
<label>更新时间：</label><span v-html="formatDateTimeByType(info.updateTime)"></span>
<label>创建时间：</label><span v-html="formatDateTimeByType(info.createTime)"></span>
<span class="btn" @click="dialogVisible = true">活动记录<i class="el-icon-arrow-right ml5"></i></span>
<span class="btn" @click="dialogVisible = true">活动统计<i class="el-icon-arrow-right ml5"></i></span>
</div>
<div class="content">
<div class="f1">
......@@ -99,8 +99,9 @@ export default {
useStatus, // 状态
};
if(this.type == 1) {
this.skuList = res.result.skuList || [];
// this.skuList = res.result.skuList || [];
this.goodsStandardInfo = res.result.giftSpecInfo ? JSON.parse(res.result.giftSpecInfo) : []; // 礼品规格信息
this.skuList = this.goodsStandardInfo.length ? res.result.skuList : [];
this.$emit('updateSkulist', this.skuList);
}
});
......
src/views/card/card-package/list.vue
......@@ -70,7 +70,12 @@
<el-table-column prop="name" label="卡券成本(元)" min-width="120">
<template slot-scope="scope">{{ scope.row.costPrice != null && scope.row.costPrice != '' && scope.row.costPrice != -1 ? scope.row.costPrice : '--' }}</template>
</el-table-column>
<el-table-column label="卡券包库存" min-width="180">
<el-table-column label="可占用库存" min-width="180">
<template slot="header">
<el-tooltip placement="top" open-delay="200"><div slot="content">可占库存：福利可以被直接使用和被应用占用的数量；<br/>已占用：福利已经被应用通过”固定库存“方式占用的数量；<br/>总库存：福利实际未产生履约单，还可以被出库的数量；</div>
<span class="tooltip-icon">可占用库存</span>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-popover placement="top-end" width="200" trigger="hover" open-delay="200" :offset="-8">
<div class="gray01 fz14">
......@@ -291,6 +296,13 @@ export default {
this.$tips({ message: '库存不能大于100w', type: 'warning' });
return;
}
let stockEnough = this.tableCardPackage.filter(function(value){
return params.count > value.remainedStock;
});
if(params.optType == 1 && stockEnough.length){
this.$tips({ message: (stockEnough[0].cardName + '库存不足'), type: 'warning' });
return;
}
this.$refs.adjust.loading = true;
params.couponPackageId = this.adjust.couponPackageId;
updatePackageStock(params).then(res => {
......
src/views/card/gic-card/card-form.js
......@@ -6,8 +6,8 @@ import { predefineColors, startDayOptionsDay, startDayOptionsMonth } from '@/co
import { marketPrefix as prefix } from '@/config';
import resultDialog from './module/result-dialog';
import sendPreview from './module/send-preview';
import commomApi from '@/api/common.js';
const { uploadUrl, getRelationId } = commomApi;
import commomApi, { uploadUrl } from '@/api/common.js';
const { getRelationId } = commomApi;
const { addCard, copyCard, checkDemoCode, getMallShopList, importCode } = api;
// 禁止回车
......@@ -862,6 +862,7 @@ export default {
}
},
zmSuccess(obj) {
console.log(11111);
this.zmImg = [ { url: obj.res.result.url, fileId: obj.res.result.fileId } ];
this.ruleForm1.giveImage = obj.res.result.url;
this.ruleForm1.giveImageField = obj.res.result.fileId;
......
src/views/card/gic-card/card-form.vue
......@@ -115,6 +115,7 @@
<li>2. 请勿导入重复的内容，导入的内容在原来基础上增加库存；</li>
<li>3. 导入的券码在当前模版上进行数据的填充；</li>
<li>4. 上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条。</li>
<li>5. 正在异步上传处理中，我们将按照顺序分批次（5000/1批次）更新库存，请稍候刷新查看库存上传结果</li>
</ul>
<el-button class="ml30" type="text" slot="reference">查看导入规则</el-button>
</el-popover>
......
src/views/card/gic-card/card-info.js
......@@ -134,9 +134,9 @@ export default {
params.applyList = JSON.stringify(params.applyList);
params.useConditionLimit = JSON.stringify(params.useConditionLimit);
this.loading = true;
if (params !== true) {
return;
}
// if (params !== true) {
// return;
// }
this.$emit('updateLoading', true);
updateCard(params).then(res => {
this.$emit('updateLoading', false);
......
src/views/card/gic-card/card-info.vue
......@@ -22,7 +22,7 @@
<el-color-picker :disabled="isInfo" popper-class="hide-picker" v-model="ruleForm.color" :predefine="predefineColors" />
</div>
</el-form-item>
<el-form-item label="导入券码" v-if="info.customCodeFlag === 2 && isEdit">
<!-- <el-form-item label="导入券码" v-if="info.customCodeFlag === 2 && isEdit">
<el-button type="text" @click="importVisible = true">上传文件</el-button>
<span class="gray03 cursor" v-if="fileList.length > 0">
<el-popover open-delay="200" placement="top-start" title="已上传列表" width="250" trigger="hover">
......@@ -30,7 +30,7 @@
<i slot="reference" class="el-icon-document ml15"></i>
</el-popover>
</span>
</el-form-item>
</el-form-item> -->
<el-form-item label="兑换券优惠内容" v-if="info.cardType === 2">
<vue-gic-goods-selector-new ref="selector4" :read-only="true" :id="info.goodsSearchId" />
</el-form-item>
......@@ -39,12 +39,21 @@
<el-form-item label="成本费用" v-if="info.cardType !== 1">{{ info.costPrice }} 元</el-form-item>
<el-form-item v-if="info.useConditionLimit" label="最低适用商品件数">{{ info.useConditionLimit.goods_adapt_number_min_limit ? `${info.useConditionLimit.goods_adapt_number_min_limit} 件` : '不限' }}</el-form-item>
<el-form-item v-if="info.useConditionLimit" label="最高适用商品件数">{{ info.useConditionLimit.goods_adapt_number_max_limit ? `${info.useConditionLimit.goods_adapt_number_max_limit} 件` : '不限' }}</el-form-item>
<el-form-item label="code类型">{{ info.customCodeFlag === 0 ? '随机生成' : '自定义号段' }}</el-form-item>
<el-form-item label="code类型">{{ info.customCodeFlag === 0 ? '随机生成' : ( info.customCodeFlag === 2 ? '导入券码':'自定义号段' ) }}</el-form-item>
<el-form-item label="code号段" v-if="info.customCodeFlag === 1">{{ info.codeBegin }}<span class="ml8 mr8">-</span>{{ info.codeEnd }}</el-form-item>
<el-form-item v-if="info.customCodeFlag === 1">
<div v-if="info.codePrefixFlag">固定开头: {{ info.codePrefix }}</div>
<div v-if="info.codeSuffixFlag" class="pt20">固定结尾: {{ info.codeSuffix }}</div>
</el-form-item>
<el-form-item label="导入券码" v-if="info.customCodeFlag === 2 && isEdit">
<el-button type="text" @click="importVisible = true">上传文件</el-button>
<span class="gray03 cursor" v-if="fileList.length > 0">
<el-popover open-delay="200" placement="top-start" title="已上传列表" width="250" trigger="hover">
<ul><li v-for="(f, idx) in fileList" :key="idx" class="ellipsis"><i class="el-icon-success success-color mr5"></i>{{ f.name }}({{ f.size }}k)</li></ul>
<i slot="reference" class="el-icon-document ml15"></i>
</el-popover>
</span>
</el-form-item>
<el-form-item label="库存数量">{{ info.couponStock }}</el-form-item>
<div class="common-title mb25 mt60" id="f2">领取和使用限制</div>
<el-form-item label="领券限制">{{ info.getLimit }} 张/人</el-form-item>
......
src/views/card/gic-card/card-list.vue
......@@ -14,7 +14,7 @@
<el-select v-model="listParams.searchType" slot="prepend" style="width:120px;" placeholder="请选择" @change="refresh">
<el-option label="卡券名称" :value="1"></el-option>
<el-option label="备注名" :value="2"></el-option>
<el-option label="副标题" :value="3"></el-option>
<!-- <el-option label="副标题" :value="3"></el-option> -->
<el-option label="demo券号" :value="4"></el-option>
</el-select>
</el-input>
......@@ -85,7 +85,12 @@
<el-table-column prop="name" label="卡券成本(元)" min-width="130">
<template slot-scope="scope">{{ scope.row.cardType == 0 || scope.row.cardType == 2 ? scope.row.costPrice : '--' }}</template>
</el-table-column>
<el-table-column label="卡券库存" min-width="180">
<el-table-column label="可占用库存" min-width="180">
<template slot="header">
<el-tooltip placement="top" open-delay="200"><div slot="content">可占库存：福利可以被直接使用和被应用占用的数量；<br/>已占用：福利已经被应用通过”固定库存“方式占用的数量；<br/>总库存：福利实际未产生履约单，还可以被出库的数量；</div>
<span class="tooltip-icon">可占用库存</span>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-popover placement="top-end" width="200" trigger="hover" open-delay="200" :offset="-8">
<div class="gray01 fz14">
......@@ -95,7 +100,7 @@
<i class="el-icon-question cursor fz12 gray-lighter" slot="reference" style="position:relative;"></i>
</el-popover>
{{ scope.row.remainedStock || 0 }}
<el-button v-if="[1, 2].includes(scope.row._status)" @click="preAdjustStock(scope.row) && scope.row.customCodeFlag == 0" class="hover-btn" icon="el-icon-edit-outline ml5" type="text"></el-button>
<el-button v-if="[1, 2].includes(scope.row._status) && scope.row.customCodeFlag == 0" @click="preAdjustStock(scope.row) && scope.row.customCodeFlag == 0" class="hover-btn" icon="el-icon-edit-outline ml5" type="text"></el-button>
<el-button v-if="[1, 2].includes(scope.row._status) && scope.row.customCodeFlag == 2" class="hover-btn ml5" @click="uploadCode(scope.row)" icon="iconfont-market4 icon-shangchuan" type="text"></el-button>
</template>
</el-table-column>
......@@ -288,7 +293,7 @@ export default {
params.sortOrder = params.sortOrder || 'desc';
if(params.searchType == 1) params.cardName = params.search;
if(params.searchType == 2) params.remarkName = params.search;
if(params.searchType == 3) params.subTitle = params.search;
// if(params.searchType == 3) params.subTitle = params.search;
if(params.searchType == 4) params.erpDemoCode = params.search;
delete params.search;
delete params.searchType;
......@@ -320,6 +325,7 @@ export default {
// 请求修改库存
adjustStockBack(params) {
this.$refs.adjust.loading = true;
console.log(params);
params.couponId = this.currentCard.couponId;
updateCardStock(params).then(res => {
this.$refs.adjust.close();
......
src/views/gift-manage/address-lib-form.vue
......@@ -10,18 +10,23 @@
<el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.defaultFlag"></el-switch>
</el-form-item>
<el-form-item prop="contact" label="联系人">
<el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit></el-input>
<el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit placeholder="请输入联系人姓名"></el-input>
</el-form-item>
<el-form-item prop="phone" label="手机号">
<dm-input-phone style="width:100%;" v-model="ruleForm.phone" show-word-limit></dm-input-phone>
<!-- <dm-input-phone style="width:100%;" v-model="ruleForm.phone" show-word-limit></dm-input-phone> -->
<el-input v-model="ruleForm.phone" type="text" class="w-480" placeholder="请输入手机号">
<el-select v-model="areaCode" slot="prepend" placeholder="请选择" style="width:90px">
<el-option :label="`+` + `${item.code}`" :value="item.code" v-for="(item, index) in areaCodeList" :key="index"></el-option>
</el-select>
</el-input>
</el-form-item>
<el-form-item prop="tel" label="电话">
<el-form-item label="电话">
<el-input v-model="tel1" :maxlength="20" style="width:120px;" placeholder="请填写区号"></el-input><span class="ml5 mr5 gray02">-</span>
<el-input v-model="tel2" :maxlength="20" style="width:120px;" placeholder="请填写座机号"></el-input><span class="ml5 mr5 gray02">-</span>
<el-input v-model="tel3" :maxlength="20" style="width:120px;" placeholder="请填写分机号"></el-input>
</el-form-item>
<el-form-item prop="cityIds" label="所在地区">
<el-cascader v-model="cityIds" style="width:100%;" :options="cityList"></el-cascader>
<el-form-item label="所在地区">
<el-cascader v-model="cityIds" style="width:100%;" :options="cityList" @change="change"></el-cascader>
</el-form-item>
<el-form-item prop="address" label="详细地址">
<el-input type="textarea" placeholder="请不要重复填写省市区" v-model="ruleForm.address" :maxlength="50" show-word-limit></el-input>
......@@ -36,6 +41,7 @@
<script>
import api from '@/api/gift.js';
import cityList from '@/assets/city.json';
import areaCodeList from '@/assets/areaCode.json';
import { isEmpty } from '@/utils/index';
const { getAddressDetails, insertOrUpdateAddress } = api;
export default {
......@@ -81,12 +87,14 @@ export default {
return {
loading: false,
addressId: this.$route.query.id,
areaCodeList: areaCodeList,
areaCode: '86',
ruleForm: {
type: 1,
defaultFlag: 0,
contact: '',
phone: '',
address: ''
address: '',
},
rules: {
contact: [ { required: true, message: '联系人不能为空', trigger: 'blur' } ],
......@@ -111,6 +119,10 @@ export default {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: '通用设置' }, { breadName: '地址库管理', breadPath: '/setting/address-lib-list' }, { breadName: (this.addressId ? '编辑' : '新建') + '地址库' } ]);
},
methods: {
change(value){
console.log(value);
// this.cityIds;
},
submitForm() {
this.$refs.ruleForm.validate((valid) => {
if (!valid) {
......@@ -131,7 +143,8 @@ export default {
provinceId: this.cityIds[0],
cityId: this.cityIds[1],
countyId: this.cityIds[2],
tel: this.tel1 ? `${this.tel1},${this.tel2},${this.tel3}` : ''
tel: this.tel1 ? `${this.tel1},${this.tel2},${this.tel3}` : '',
areaNo: this.areaCode,
};
if(this.addressId) {
params.addressId = this.addressId;
......@@ -158,8 +171,11 @@ export default {
this.ruleForm[key] = info[key];
}
});
if(info.areaNo){
this.areaCode = info.areaNo || '';
}
if(info.tel) {
const tel = info.tel.join(',');
const tel = info.tel.split(',');
this.tel1 = tel[0];
this.tel2 = tel[1];
this.tel3 = tel[2];
......@@ -173,3 +189,8 @@ export default {
}
};
</script>
<style scoped>
.w-480 {
width: 480px;
}
</style>
\ No newline at end of file
src/views/gift-manage/address-lib-list.vue
......@@ -6,11 +6,11 @@
<el-table tooltip-effect="dark" :data="tableList" style="width:100%">
<el-table-column prop="contact" label="联系人"> </el-table-column>
<el-table-column prop="phone" label="联系方式"> </el-table-column>
<el-table-column prop="address" label="地址"> </el-table-column>
<el-table-column prop="address" label="地址" min-width="120px" show-overflow-tooltip> </el-table-column>
<el-table-column label="地址类型">
<template slot-scope="scope">
<el-tag v-if="scope.row.defaultFlag" class="mr5">默认</el-tag>
{{ scope.row.type == 1 ? '退款地址' : '--' }}
<el-tag v-if="scope.row.defaultFlag" class="ml5">默认</el-tag>
</template>
</el-table-column>
<el-table-column label="操作">
......
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="getTableList" @clear="getTableList"></el-input>
<el-input placeholder="请输入会员信息搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @change="getTableList" @clear="getTableList"></el-input>
</div>
<el-table :data="tableData" class="mt20">
<el-table-column v-for="(item, index) in headList" :key="index" :label="item" :prop="index === 0 ? 'paramOne' : (index === 1 ? 'paramTwo' : 'paramThree')"></el-table-column>
......@@ -80,16 +80,18 @@ export default {
console.log(res);
this.tableData = res.result.result || [];
let list = [];
list = this.tableData[0].headList;
this.headList = list.map((item, index) => {
if(item.indexOf('<span style="text-decoration: underline">') != -1){
item = item.replace('<span style="text-decoration: underline">', '');
}
if(item.indexOf('</span>') != -1){
item = item.replace('</span>', '');
}
return item;
});
list = this.tableData.length ? this.tableData[0].headList : [];
if(list.length){
this.headList = list.map((item, index) => {
if(item.indexOf('<span style="text-decoration: underline">') != -1){
item = item.replace('<span style="text-decoration: underline">', '');
}
if(item.indexOf('</span>') != -1){
item = item.replace('</span>', '');
}
return item;
});
}
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
......
src/views/gift-manage/module/pickup-form-content.vue
......@@ -2,7 +2,8 @@
<div>
<el-form-item label="买家可选自提时间">
<el-switch v-model="ruleForm.chooseTimeFlag" :active-value="1" :inactive-value="0"></el-switch>
<p>开启表示买家可选择自提时间，商户需按约定时间备货完成</p>
<p style="font-size:12px;color:#909399">若不开启，则默认会员可在任意时间提货</p>
<p style="font-size:12px;color:#909399">若开启，表示买家可选择自提时间，商户需按约定时间备货完成</p>
</el-form-item>
<template v-if="ruleForm.chooseTimeFlag">
<el-form-item label="日期类型" required>
......
src/views/gift-manage/module/update-real-cost.vue
......@@ -36,7 +36,7 @@
<el-form class="mt20">
<el-form-item label="调整备注" required>
<template>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</template>
</el-form-item>
</el-form>
......@@ -228,6 +228,7 @@ export default {
giftSkuId: ''
};
}
this.updateList.push({ giftSkuId: this.skuSellObj[item.mapId].giftSkuId, costPrice: this.skuSellObj[item.mapId].giftSkuCostPrice });
}
this.skuSellObj = deepClone(this.skuSellObj);
this.costPrice = this.skuSellObj[this.goodsSkuList[0].mapId].giftSkuCostPrice;
......@@ -307,7 +308,6 @@ export default {
this.banthCost = '';
},
changeSingleCost(id, cost){
console.log(id);
if(!cost){
this.$message.error('请完善成本');
}
......
src/views/gift-manage/module/update-real-stock.vue
......@@ -55,7 +55,7 @@
<el-form class="mt20">
<el-form-item label="调整备注" required>
<template>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</template>
</el-form-item>
</el-form>
......@@ -345,9 +345,9 @@ export default {
this.banthStock = undefined;
},
changeSingleStock(id, stock, stockType){
if(!stock){
this.$message.error('请完善库存');
}
// if(!stock){
// this.$message.error('请完善库存');
// }
if(this.updateList.length > 0){
let iii;
let result = this.updateList.some((item, index) =>{
......
src/views/gift-manage/module/update-virtual-cost.vue
......@@ -10,7 +10,7 @@
</el-form-item>
<el-form-item label="调整备注" required>
<template>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</template>
</el-form-item>
</el-form>
......
src/views/gift-manage/module/update-virtual-stock.vue
......@@ -31,7 +31,7 @@
</div>
</el-form-item>
<el-form-item label="调整备注" required>
<el-input type="textarea" style="width:260px" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input type="textarea" style="width:260px" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</el-form-item>
</el-form>
</div>
......@@ -111,7 +111,8 @@ export default {
let params = {
giftId: this.stockData.id,
file: this.file,
remark: this.textarea
remark: this.textarea,
giftName: this.stockData.giftName
};
console.log(params.file);
this.loading = true;
......
src/views/gift-manage/pickup-form.vue
<template>
<div class="p20" v-loading="loading">
<el-form :model="ruleForm" ref="ruleForm" :rules="rules" label-width="160px">
<h3 class="pb20">自提点信息</h3>
<h3 class="pb20 title mb30">自提点信息</h3>
<el-form-item label="自提点类型">
<el-radio v-model="ruleForm.type" :label="1">从门店中选择</el-radio>
</el-form-item>
......@@ -33,7 +33,7 @@
</el-form-item>
</template>
<h3 class="pt20 pb20">自提点信息</h3>
<h3 class="pb20 title mb30">自提点设置</h3>
<form-content :rule-form.sync="ruleForm"></form-content>
<el-form-item class="mt20">
<el-button @click="handleSubmit()" type="primary">{{ isAdd ? '确认新建' : '保存' }}</el-button>
......@@ -145,7 +145,7 @@ export default {
Object.keys(this.ruleForm).map(key => {
const obj = {};
if (key in res.result) {
obj[key] == info[key];
obj[key] = info[key];
// this.ruleForm[key] = info[key];
}
Object.assign(this.ruleForm, obj);
......@@ -155,13 +155,13 @@ export default {
// 其他的
if(info.dateType == 1) {
// 动态日期
this.dynamicType = pickupDateInfo.setType;
this.dynamicStop = pickupDateInfo.validite;
this.ruleForm.dynamicType = pickupDateInfo.setType;
this.ruleForm.dynamicStop = pickupDateInfo.validite;
if(pickupDateInfo.setType == 1) {
this.dynamicH = parseInt(pickupDateInfo.time / 60);
this.dynamicM = pickupDateInfo.time % 60;
this.ruleForm.dynamicH = parseInt(pickupDateInfo.time / 60);
this.ruleForm.dynamicM = pickupDateInfo.time % 60;
} else {
this.dynamicD = pickupDateInfo.time / 60 / 24;
this.ruleForm.dynamicD = pickupDateInfo.time / 60 / 24;
}
} else {
// 固定日期
......@@ -238,4 +238,21 @@ export default {
.w600 {
width: 600px;
}
.title{
height: 40px;
line-height: 40px;
background: #F7F8FA;
}
.title::before{
clear: both;
content: "";
display: inline-block;
/* // height: 0; */
overflow: hidden;
width: 3px;
height: 12px;
line-height: 14px;
margin-right: 8px;
background: #2F54EB;
}
</style>
\ No newline at end of file
src/views/gift-manage/pickup-list.vue
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<el-input prefix-icon="el-icon-search" v-model="listParams.name" @change="refresh" class="w400 mrAuto" clearable placeholder="请输入自提点名称进行搜索"></el-input>
<el-select class="more-select mr10" @change="mutiOption" placeholder="批量操作">
<el-input prefix-icon="el-icon-search" v-model="listParams.name" @change="refresh" class="w260 mrAuto" clearable placeholder="请输入自提点名称进行搜索"></el-input>
<el-select class="more-select w160 mr10" @change="mutiOption" placeholder="批量操作">
<el-option :disabled="!selectList.length" :value="0">批量设置</el-option>
<el-option :disabled="!selectList.length" :value="1">批量删除</el-option>
</el-select>
<el-button type="default" @click="exportExcel">导出自提点</el-button>
<el-button type="default" @click="exportExcel"><i class="iconfont-welfare4 icon-xiazai"></i>&nbsp;导出</el-button>
<el-button type="primary" @click="$router.push('/setting/pickup-add')">新建自提点</el-button>
</div>
<el-table tooltip-effect="dark" :data="tableList" style="width:100%" @selection-change="(list) => { selectList = list; }">
......@@ -16,7 +16,7 @@
<el-table-column label="联系电话" prop="phone" min-width="140px;"> </el-table-column>
<el-table-column label="自提时间可选" min-width="120px;">
<template slot-scope="scope">
{{ scope.row.chooseTimeFlag ? '可选' : '不可选' }}
{{ scope.row.chooseTimeFlag ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="操作">
......@@ -95,7 +95,18 @@ export default {
}
if(val == 1) {
// 批量删除
this.del(this.selectList.map(v => v.pickupId).join(','));
this.$confirm('<div>删除后礼品中不支持该自提点，确定删除选中自提点吗？</div>', '批量删除', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '批量删除',
})
.then(() => {
this.del(this.selectList.map(v => v.pickupId).join(','));
});
// this.del(this.selectList.map(v => v.pickupId).join(','));
}
},
del(pickupIds) {
......
src/views/gift-manage/real-gift-detail.vue
......@@ -99,7 +99,13 @@
</div>
</template>
<template v-slot:header>
<span>成本</span>
<!-- <span>成本</span> -->
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">成本(元)</span>
<span slot="content">
若SKU的成本未填写则按照SPU价格计算
</span>
</el-tooltip>
<el-popover placement="top" trigger="click" ref="popover3">
<div>
<dm-input-amount v-model.trim="handleData.giftSkuCostPrice" width="140" style="margin-left:-2px;" controls-position="right" precision="2" :min="0" :max="999999.99"></dm-input-amount>
......@@ -180,8 +186,8 @@
</div>
</div>
</el-form-item>
<el-form-item label="成本" class="w-630" prop="costPrice">
<dm-input-amount v-model="goodsForm.costPrice" width="180" :min="0" :max="999999.99" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-amount>
<el-form-item label="成本" class="w-630" prop="costPrice" :rules="[{ validator: costPriceValide, trigger: 'blur' }]">
<dm-input-amount v-model="goodsForm.costPrice" width="180" @blur="costPriceValide(goodsForm.costPrice)" :min="0" :max="999999.99" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-amount>
</el-form-item>
<el-form-item label="可占用库存" class="w-630" prop="stock">
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="0" :disabled="goodsStandardInfo.length > 0"></dm-input-number>
......@@ -292,6 +298,15 @@ export default {
selectPickupStore,
},
data() {
let costPriceValide = (rule, value, callback) =>{
if(value){
const regExp = /[\u4e00-\u9fa5]/g;
if(regExp.test(value)) {
return callback(new Error('成本只能是数字'));
}
}
callback();
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
if(value.split('').length > 32){
......@@ -385,6 +400,7 @@ export default {
},
validateGoodsCode,
validateGoodsBarCode,
costPriceValide,
// 规格信息
goodsStandardInfo: [],
standardList: [], // 当前操作的规格列表
......@@ -411,8 +427,9 @@ export default {
maxlength: 5, // 图片数量 默认 5
image: [],
// 规格值图片上传
uploadAction: window.location.origin + '/welfare/upload/upload-image',
// uploadAction: 'https://four.gicdev.com/welfare/upload/upload-image',
uploadAction: window.location.origin + '/api-marketing/upload/upload-image',
// uploadAction: 'https://four.gicdev.com/api-marketing/upload/upload-image',
// uploadAction: '/welfare/upload/upload-image',
openStorePick: 0,
btnLoading: false,
loading: false,
......@@ -451,6 +468,9 @@ export default {
this.getStandardList(); // 获取规格列表
},
methods: {
stdImgUpload(){
console.log(this.isStdImg);
},
getGiftId(){
// let giftId;
getGiftId().then(res =>{
......@@ -997,6 +1017,11 @@ export default {
this.handleSpuStock();
},
handleCostPrice(){
const regExp = /[\u4e00-\u9fa5]/g;
if(regExp.test(this.handleData.giftSkuCostPrice)) {
this.handleData.giftSkuCostPrice = '';
this.$message.error('成本只能是数字');
}
console.log(this.handleData.giftSkuCostPrice);
for (let item in this.skuSellObj) {
console.log(this.skuSellObj[item].giftSkuId);
......@@ -1248,6 +1273,13 @@ export default {
},
// 成本价
handleValidIntegral(value, key, num) {
if(value){
const regExp = /[\u4e00-\u9fa5]/g;
if(regExp.test(value)) {
this.skuSellObj[key].giftSkuCostPrice = '';
this.$message.error('成本只能是数字');
}
}
if (!value && value !== 0) {
this.skuSellObj[key].giftSkuCostPriceStatus = false;
this.$message.error('成本价是必填项');
......@@ -1656,6 +1688,10 @@ export default {
}
}
}
.undeline-dash{
border-bottom: 1px dashed #2F54EB;
font-weight:500;
}
.from-content .see-btn {
color: #909399;
margin-left: 15px;
......
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="getSearchList2">
<el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @change="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>
......@@ -21,7 +21,8 @@
<el-button v-if="unfoldStatus" type="text" @click="handleUnfold" >收起<i class="el-icon-arrow-up"></i></el-button>
</div>
<div class="fr">
<el-select v-model="batchOperate" placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch">
<!-- <el-select v-model="batchOperate" placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch"> -->
<el-select placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch">
<el-option label="批量隐藏" :value="0"></el-option>
<el-option label="批量取消隐藏" :value="1"></el-option>
<el-option label="批量禁用" :value="2"></el-option>
......@@ -33,9 +34,9 @@
<div style="margin: 20px 20px 0px 20px;" v-if="unfoldStatus">
<div style="height:32px;">
<div class="spanclass">福利成本：</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass">-</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass" style="margin-right:28px">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
<el-option label="由近及远" :value="0"></el-option>
......@@ -44,9 +45,9 @@
</div>
<div class="mt20" style="height:32px;">
<div class="spanclass">可占库存：</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">-</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 mr40 w140" v-model="query.endStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 mr40 w140" v-model="query.endStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">更新时间范围：</div>
<el-date-picker v-model="timeValue" @change="changeTime" type="datetimerange" class="w350" align="right" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</div>
......@@ -275,7 +276,7 @@ export default {
},
methods: {
init() {
this.searchType = 1;
// this.searchType = 1;
this.getTableList();
},
getSearchList() {
......@@ -286,6 +287,7 @@ export default {
this.query.type = 1;
this.query.currentPage = 1;
this.getTableList();
this.handleChangeType();
},
// 列表筛选条件更改
handleChangeType() {
......@@ -298,7 +300,7 @@ export default {
} else if (this.query.type === 0) {
this.placeholderText = '请输入福利id';
}
console.log(this.searchType);
// console.log(this.searchType);
},
// 实物礼品列表
getTableList() {
......@@ -382,33 +384,33 @@ export default {
type: value
};
if(value == 2){
this.$confirm('<div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效，确认禁用？</div>', '批量禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '批量禁用',
})
.then(() => {
this.batchRequest(params);
console.log('批量禁用');
});
}else if(value == 0){
this.$confirm('<div>是否隐藏?</div>', '批量隐藏', {
this.$confirm('<div>是否批量隐藏?</div>', '批量隐藏', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '批量隐藏',
})
.then(() => {
this.batchRequest(params);
console.log('批量隐藏');
});
}else if(value == 1){
this.$confirm('<div>是否取消隐藏?</div>', '批量取消隐藏', {
this.$confirm('<div>是否批量取消隐藏?</div>', '批量取消隐藏', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
......@@ -421,13 +423,13 @@ export default {
console.log('批量取消隐藏');
});
}else if(value == 3){
this.$confirm('<div>是否启用?</div>', '批量启用', {
this.$confirm('<div>是否批量启用?</div>', '批量启用', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '批量启用',
})
.then(() => {
this.batchRequest(params);
......@@ -486,7 +488,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '取消隐藏',
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -525,11 +527,11 @@ export default {
};
this.batchRequest(params);
}else{
this.$confirm('<div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效，确认禁用？</div>', '禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。</div>', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
// customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
}).then(() => {
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -22,7 +22,7 @@
</div>
<div class="form-section">
<h3>库存信息</h3>
<el-form-item label="成本" class="w-630" prop="virCostPrice">
<el-form-item label="成本" class="w-630" prop="virCostPrice" :rules="[{ validator: costPriceValide, trigger: 'blur' }]">
<dm-input-amount v-model="goodsForm.virCostPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
</el-form-item>
<el-form-item label="库存" class="w-630" prop="stock">
......@@ -80,7 +80,7 @@
:on-success="successUpload"
accept=".xls,.xlsx"
:before-upload="beforeUploadFile"
:data="{ giftId: giftId, remark: '' }"
:data="{ giftId: giftId, remark: '', giftName: goodsForm.giftName }"
with-credentials>
<el-button class="upload-trigger"><i class="iconfont-components4 icon-cp-shangc upload-icon"></i> 上传</el-button>
<span slot="tip" class="upload-tip inline-block">
......@@ -176,6 +176,15 @@ export default {
checkUploadDetail,
},
data() {
let costPriceValide = (rule, value, callback) =>{
if(value){
const regExp = /[\u4e00-\u9fa5]/g;
if(regExp.test(value)) {
return callback(new Error('成本只能是数字'));
}
}
callback();
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
if(value.split('').length > 32){
......@@ -259,6 +268,7 @@ export default {
},
validateGoodsCode,
validateGoodsBarCode,
costPriceValide,
giftId: '',
editorWidth: 900,
// 图片墙数据
......
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="getSearchList2">
<el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @change="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>
......@@ -21,7 +21,8 @@
<el-button v-if="unfoldStatus" type="text" @click="handleUnfold" >收起<i class="el-icon-arrow-up"></i></el-button>
</div>
<div class="fr">
<el-select v-model="batchOperate" placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch">
<!-- <el-select v-model="batchOperate" placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch"> -->
<el-select placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch">
<el-option label="批量隐藏" :value="0"></el-option>
<el-option label="批量取消隐藏" :value="1"></el-option>
<el-option label="批量禁用" :value="2"></el-option>
......@@ -33,9 +34,9 @@
<div style="margin: 20px 20px 0px 20px;" v-if="unfoldStatus">
<div style="height:32px;">
<div class="spanclass">福利成本：</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass">-</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass" style="margin-right:28px">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
<el-option label="由近及远" :value="0"></el-option>
......@@ -44,9 +45,9 @@
</div>
<div class="mt20" style="height:32px;">
<div class="spanclass">可占库存：</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">-</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 w140 mr40" v-model="query.endStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 w140 mr40" v-model="query.endStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">更新时间范围：</div>
<el-date-picker v-model="timeValue" @change="changeTime" type="datetimerange" class="w350" align="right" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</div>
......@@ -275,6 +276,7 @@ export default {
id: '',
remainedStock: '',
textarea: '',
giftName: ''
},
StockDialog: false,
integralDialog: false,
......@@ -314,6 +316,7 @@ export default {
this.query.type = 1;
this.query.currentPage = 1;
this.getTableList();
this.handleChangeType();
},
// 列表筛选条件更改
handleChangeType() {
......@@ -454,13 +457,13 @@ export default {
type: value
};
if(value == 2){
this.$confirm('<div>已添加被禁用礼品的活动将会失效，确认禁用?</div>', '批量禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。</div>', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
confirmButtonText: '批量禁用',
})
.then(() => {
this.batchRequest(params);
......@@ -473,7 +476,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '隐藏',
confirmButtonText: '批量隐藏',
})
.then(() => {
this.batchRequest(params);
......@@ -499,7 +502,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '启用',
confirmButtonText: '批量启用',
})
.then(() => {
this.batchRequest(params);
......@@ -558,7 +561,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '取消隐藏',
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -596,11 +599,11 @@ export default {
};
this.batchRequest(params);
}else{
this.$confirm('<div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效，确认禁用？</div>', '禁用', {
this.$confirm('<div>确认禁用该礼品吗？</div><div>禁用礼品将在福利组件不展示，并且该礼品参加的活动将全部失效。</div>', '', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
// customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
}).then(() => {
......@@ -634,7 +637,7 @@ export default {
updateStock(item) {
this.stockData.id = item.giftId;
this.stockData.remainedStock = item.remainedStock;
this.stockData.textarea = item.textarea;
this.stockData.giftName = item.giftName;
this.StockDialog = true;
},
closeUpdateStock() {
......
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