Skip to content

W
welfare
Commit 7e8d8315 by 陈羽
Options

Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

parents 4f832a52 94410d2a
Showing with 383 additions and 286 deletions
dist/css/card-package.6161bca7.css → dist/css/card-package.22732e97.css
.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-f6806fa8]{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-f6806fa8]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-fb5c9552]{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-fb5c9552]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/card-package~gic-card.06e52b24.css 0 → 100644
.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}.statistics .el-table__empty-block .el-table__empty-text:before{display:none}.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;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 .head span.btn:hover{color:#2f54eb}.welfare-item .content{height:83px;overflow:hidden;padding:0;-webkit-box-align:center;-ms-flex-align:center;align-items:center;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:-4px;left:0;width:60px;height:60px;border-radius:0}.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/card-package~gic-card.be9d6c78.css deleted 100644 → 0
.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}.statistics .el-table__empty-block .el-table__empty-text:before{display:none}.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;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;-webkit-box-align:center;-ms-flex-align:center;align-items:center;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:-4px;left:0;width:60px;height:60px;border-radius:0}.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-033d13cc.257a37dd.css 0 → 100644
.step-text[data-v-1116f3b6]{color:#303133;font-size:12px;line-height:24px;font-weight:400}.dash-style[data-v-1116f3b6]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-1116f3b6]{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-1116f3b6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-1116f3b6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-1116f3b6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-1116f3b6]{padding:0}.w-630[data-v-1116f3b6]{width:630px}.mb56[data-v-1116f3b6]{margin-bottom:56px}.from-content[data-v-1116f3b6]{position:relative}.from-content .demo-ruleForm .form-section[data-v-1116f3b6]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-1116f3b6]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-1116f3b6]: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-1116f3b6]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-1116f3b6]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-1116f3b6]{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-1116f3b6]{margin-top:12px}.from-content .anchor-link[data-v-1116f3b6]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-1116f3b6]{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-1116f3b6]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-1116f3b6]:hover{color:#2f54ed}.ml20[data-v-1116f3b6]{margin-left:20px}.mr10[data-v-1116f3b6]{margin-right:10px}.tips-content[data-v-1116f3b6]{position:absolute;left:-4px;top:6px}.store-tips[data-v-1116f3b6]{width:200px;position:absolute;left:-10px}.underline[data-v-1116f3b6]{text-decoration:underline}.pickup-upload[data-v-1116f3b6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-1116f3b6]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-1116f3b6]{font-size:14px}.pickup-upload .pickup-list[data-v-1116f3b6]{margin-top:-10px;margin-left:117px}.pickup-upload .pickup-list .pickup-list-name[data-v-1116f3b6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-1116f3b6]{font-size:14px}.upload-tip-text[data-v-1116f3b6]{font-size:12px;color:#303133}.template-intro[data-v-1116f3b6]{margin-left:33px;background:#f7f8fa;width:400px;height:280px}.template-title[data-v-1116f3b6]{font-size:12px;line-height:17px;color:#303133;margin-left:16px;margin-top:16px;font-weight:400}.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-24c0535a.05073e0a.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-a3970ba0]{border-color:#1890ff}.upload-ele .el-button[data-v-a3970ba0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a3970ba0]{padding:0}.uploadText p[data-v-a3970ba0]{line-height:26px}.upload-tip-text[data-v-a3970ba0]{font-size:12px;color:#303133}.pickup-upload[data-v-a3970ba0]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-a3970ba0]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-a3970ba0]{font-size:14px}.pickup-upload .pickup-list[data-v-a3970ba0]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a3970ba0]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a3970ba0]{font-size:14px}.w360[data-v-2d39f379]{width:360px}.w-160[data-v-2d39f379]{width:160px}.w140[data-v-2d39f379]{width:140px}.w350[data-v-2d39f379]{width:350px}.mr4[data-v-2d39f379]{margin-right:4px}.tab-top[data-v-2d39f379]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-2d39f379],.tab-top[data-v-2d39f379]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-2d39f379]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-2d39f379]{height:60px}.table-content .img-text img[data-v-2d39f379]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-2d39f379]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-2d39f379]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-2d39f379]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-2d39f379]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-2d39f379]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-2d39f379]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-2d39f379]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-2d39f379]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-2d39f379]:hover{color:#2f54ed}.undeline-dash[data-v-2d39f379]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-2d39f379]{display:inline-block;line-height:32px}.hidden-data[data-v-2d39f379]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-3195a346.af72490c.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-a3970ba0]{border-color:#1890ff}.upload-ele .el-button[data-v-a3970ba0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a3970ba0]{padding:0}.uploadText p[data-v-a3970ba0]{line-height:26px}.upload-tip-text[data-v-a3970ba0]{font-size:12px;color:#303133}.pickup-upload[data-v-a3970ba0]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-a3970ba0]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-a3970ba0]{font-size:14px}.pickup-upload .pickup-list[data-v-a3970ba0]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a3970ba0]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a3970ba0]{font-size:14px}.w360[data-v-3ee3096b]{width:360px}.w-160[data-v-3ee3096b]{width:160px}.w140[data-v-3ee3096b]{width:140px}.w350[data-v-3ee3096b]{width:350px}.mr4[data-v-3ee3096b]{margin-right:4px}.tab-top[data-v-3ee3096b]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-3ee3096b],.tab-top[data-v-3ee3096b]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-3ee3096b]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-3ee3096b]{height:60px}.table-content .img-text img[data-v-3ee3096b]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-3ee3096b]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-3ee3096b]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-3ee3096b]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-3ee3096b]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-3ee3096b]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-3ee3096b]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-3ee3096b]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-3ee3096b]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-3ee3096b]:hover{color:#2f54ed}.undeline-dash[data-v-3ee3096b]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-3ee3096b]{display:inline-block;line-height:32px}.hidden-data[data-v-3ee3096b]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-6dc8dbce.35eba226.css 0 → 100644
.ml8[data-v-5f8a1d3e]{margin-left:8px}.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-985bdfd8]{width:360px}.w-160[data-v-985bdfd8]{width:160px}.w140[data-v-985bdfd8]{width:140px}.w350[data-v-985bdfd8]{width:350px}.mr4[data-v-985bdfd8]{margin-right:4px}.tab-top[data-v-985bdfd8]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-985bdfd8],.tab-top[data-v-985bdfd8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-985bdfd8]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-985bdfd8]{height:60px}.table-content .img-text img[data-v-985bdfd8]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-985bdfd8]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-985bdfd8]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-985bdfd8]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-985bdfd8]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-985bdfd8]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-985bdfd8]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-985bdfd8]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-985bdfd8]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-985bdfd8]:hover{color:#2f54ed}.undeline-dash[data-v-985bdfd8]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-985bdfd8]{display:inline-block;line-height:32px}.hidden-data[data-v-985bdfd8]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-7f29ad28.3ea8fb1e.css deleted 100644 → 0
.empty_block[data-v-4690d4cb]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-4690d4cb]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-4690d4cb]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-4690d4cb]{display:inline-block}.logistics-info span+span[data-v-4690d4cb]{margin-left:10px}.logistics-step[data-v-4690d4cb]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-4690d4cb]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-4690d4cb]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-4690d4cb]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-4690d4cb]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-4690d4cb]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-4690d4cb]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-827dd10e.05193b08.css deleted 100644 → 0
.step-text[data-v-890cc97a]{color:#303133;font-size:12px;line-height:24px;font-weight:400}.dash-style[data-v-890cc97a]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-890cc97a]{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-890cc97a]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-890cc97a]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-890cc97a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-890cc97a]{padding:0}.w-630[data-v-890cc97a]{width:630px}.mb56[data-v-890cc97a]{margin-bottom:56px}.from-content[data-v-890cc97a]{position:relative}.from-content .demo-ruleForm .form-section[data-v-890cc97a]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-890cc97a]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-890cc97a]: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-890cc97a]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-890cc97a]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-890cc97a]{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-890cc97a]{margin-top:12px}.from-content .anchor-link[data-v-890cc97a]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-890cc97a]{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-890cc97a]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-890cc97a]:hover{color:#2f54ed}.ml20[data-v-890cc97a]{margin-left:20px}.mr10[data-v-890cc97a]{margin-right:10px}.tips-content[data-v-890cc97a]{position:absolute;left:-4px;top:6px}.store-tips[data-v-890cc97a]{width:200px;position:absolute;left:-10px}.underline[data-v-890cc97a]{text-decoration:underline}.pickup-upload[data-v-890cc97a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-890cc97a]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-890cc97a]{font-size:14px}.pickup-upload .pickup-list[data-v-890cc97a]{margin-top:-10px;margin-left:117px}.pickup-upload .pickup-list .pickup-list-name[data-v-890cc97a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-890cc97a]{font-size:14px}.upload-tip-text[data-v-890cc97a]{font-size:12px;color:#303133}.template-intro[data-v-890cc97a]{margin-left:33px;background:#f7f8fa;width:400px;height:280px}.template-title[data-v-890cc97a]{font-size:12px;line-height:17px;color:#303133;margin-left:16px;margin-top:16px;font-weight:400}.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-bfef79a2.b4ca71d6.css → dist/css/chunk-a7320cc8.a794f702.css
[data-v-45123e19] .el-divider--horizontal{margin:16px 0;margin-top:20px;border-bottom:1px dashed #dcdfe6;background-color:transparent}.upload[data-v-45123e19] .el-button{border-style:dashed}.btn-download[data-v-45123e19]{position:absolute;left:180px;top:9px}.el-icon-warning[data-v-2fa0e8c2]{color:#faad14;font-size:21px}.empty_block[data-v-098d57a9]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.el-divider[data-v-098d57a9]{background-color:#e4e7ed}.logistics-info[data-v-098d57a9]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-098d57a9]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-098d57a9]{display:inline-block}.logistics-info span+span[data-v-098d57a9]{margin-left:10px}.logistics-step[data-v-098d57a9]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-098d57a9]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-098d57a9]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-098d57a9]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-098d57a9]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-098d57a9]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-098d57a9]{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}
\ No newline at end of file
[data-v-45123e19] .el-divider--horizontal{margin:16px 0;margin-top:20px;border-bottom:1px dashed #dcdfe6;background-color:transparent}.upload[data-v-45123e19] .el-button{border-style:dashed}.btn-download[data-v-45123e19]{position:absolute;left:180px;top:9px}.el-icon-warning[data-v-2fa0e8c2]{color:#faad14;font-size:21px}.empty_block[data-v-45296252]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.el-divider[data-v-45296252]{background-color:#e4e7ed}.logistics-info[data-v-45296252]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-45296252]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-45296252]{display:inline-block}.logistics-info span+span[data-v-45296252]{margin-left:10px}.logistics-step[data-v-45296252]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-45296252]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-45296252]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-45296252]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-45296252]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-45296252]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-45296252]{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}
\ No newline at end of file
dist/css/chunk-d7364742.be14d1e8.css 0 → 100644
.empty_block[data-v-7e95e01c]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-7e95e01c]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-7e95e01c]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-7e95e01c]{display:inline-block}.logistics-info span+span[data-v-7e95e01c]{margin-left:10px}.logistics-step[data-v-7e95e01c]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-7e95e01c]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-7e95e01c]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-7e95e01c]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-7e95e01c]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-7e95e01c]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-7e95e01c]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-e47ee40c.fe50e67b.css deleted 100644 → 0
.ml8[data-v-5f8a1d3e]{margin-left:8px}.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-599dfbe1]{width:360px}.w-160[data-v-599dfbe1]{width:160px}.w140[data-v-599dfbe1]{width:140px}.w350[data-v-599dfbe1]{width:350px}.mr4[data-v-599dfbe1]{margin-right:4px}.tab-top[data-v-599dfbe1]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-599dfbe1],.tab-top[data-v-599dfbe1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-599dfbe1]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-599dfbe1]{height:60px}.table-content .img-text img[data-v-599dfbe1]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-599dfbe1]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-599dfbe1]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-599dfbe1]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-599dfbe1]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-599dfbe1]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-599dfbe1]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-599dfbe1]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-599dfbe1]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-599dfbe1]:hover{color:#2f54ed}.undeline-dash[data-v-599dfbe1]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-599dfbe1]{display:inline-block;line-height:32px}.hidden-data[data-v-599dfbe1]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/index.html
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link rel=stylesheet href=/welfare/static/css/index.css><link href=https://cdn.bootcss.com/element-ui/2.12.0/theme-chalk/index.css rel=stylesheet><link href=//at.alicdn.com/t/font_1434755_89ndzcq2ndm.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1418963_hrpaaxicjis.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1393418_z4h4445tiwe.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_zw94rco4ss.css><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_1418963_8ssgac9p1n7.css><script src=//at.alicdn.com/t/font_1418963_8ssgac9p1n7.js></script><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.5.css><script src=//at.alicdn.com/t/font_1418963_hrpaaxicjis.js></script><title>福利中心</title><link href=/welfare/css/card-package.6161bca7.css rel=prefetch><link href=/welfare/css/card-package~gic-card.be9d6c78.css rel=prefetch><link href=/welfare/css/chunk-11ded692.9fbf7749.css rel=prefetch><link href=/welfare/css/chunk-24c0535a.05073e0a.css rel=prefetch><link href=/welfare/css/chunk-28da0001.01c58546.css rel=prefetch><link href=/welfare/css/chunk-593e752c.8f300845.css rel=prefetch><link href=/welfare/css/chunk-7176d2b4.f11404c0.css rel=prefetch><link href=/welfare/css/chunk-7934f5c2.fa781561.css rel=prefetch><link href=/welfare/css/chunk-7f29ad28.3ea8fb1e.css rel=prefetch><link href=/welfare/css/chunk-827dd10e.05193b08.css rel=prefetch><link href=/welfare/css/chunk-8310ba48.ad42e8a8.css rel=prefetch><link href=/welfare/css/chunk-a144d7ae.855b4e1e.css rel=prefetch><link href=/welfare/css/chunk-bfef79a2.b4ca71d6.css rel=prefetch><link href=/welfare/css/chunk-e47ee40c.fe50e67b.css rel=prefetch><link href=/welfare/css/gic-card.bd1c92b6.css rel=prefetch><link href=/welfare/js/card-package.c63b2f75.js rel=prefetch><link href=/welfare/js/card-package~gic-card.3e378796.js rel=prefetch><link href=/welfare/js/chunk-0d4ebdfa.5efe7770.js rel=prefetch><link href=/welfare/js/chunk-11ded692.80132e09.js rel=prefetch><link href=/welfare/js/chunk-24c0535a.028c0132.js rel=prefetch><link href=/welfare/js/chunk-28da0001.87a0a5a1.js rel=prefetch><link href=/welfare/js/chunk-350bdb36.362051e2.js rel=prefetch><link href=/welfare/js/chunk-593e752c.c7bc4224.js rel=prefetch><link href=/welfare/js/chunk-6287d3af.83951c5f.js rel=prefetch><link href=/welfare/js/chunk-7176d2b4.80ed60ab.js rel=prefetch><link href=/welfare/js/chunk-7934f5c2.1fd1abc5.js rel=prefetch><link href=/welfare/js/chunk-7f29ad28.0d61ad1b.js rel=prefetch><link href=/welfare/js/chunk-827dd10e.bfb3c0e4.js rel=prefetch><link href=/welfare/js/chunk-8310ba48.7e085ac4.js rel=prefetch><link href=/welfare/js/chunk-a144d7ae.cb77863f.js rel=prefetch><link href=/welfare/js/chunk-bfef79a2.3144aa31.js rel=prefetch><link href=/welfare/js/chunk-e47ee40c.f91b2481.js rel=prefetch><link href=/welfare/js/gic-card.1fea2437.js rel=prefetch><link href=/welfare/css/app.ef3ab8a4.css rel=preload as=style><link href=/welfare/js/app.a7ea7f23.js rel=preload as=script><link href=/welfare/js/chunk-vendors.be22c79d.js rel=preload as=script><link href=/welfare/css/app.ef3ab8a4.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue-router/3.0.3/vue-router.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/base.1.0.0.17.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.61.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-select.1.1.92.js></script><script src=//web-1251519181.file.myqcloud.com/components/goods-selector.1.0.51.js></script><script src=//web-1251519181.file.myqcloud.com/components/card-select.1.0.34.js></script><script src=//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-data.1.1.2.js></script><script src=//web-1251519181.file.myqcloud.com/components/integral-select.1.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/rule-engine.1.0.94.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/perm-button.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.7.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><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.4.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.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js></script><script src=/welfare/js/chunk-vendors.be22c79d.js></script><script src=/welfare/js/app.a7ea7f23.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/welfare/favicon2.ico><link href=//at.alicdn.com/t/font_1434755_up9fc92yhi.css rel=stylesheet><link rel=stylesheet type=text/css href=//at.alicdn.com/t/font_2349215_1s8bd0r1t2ri.css><title>福利中心</title><link href=/welfare/css/card-package.22732e97.css rel=prefetch><link href=/welfare/css/card-package~gic-card.06e52b24.css rel=prefetch><link href=/welfare/css/chunk-033d13cc.257a37dd.css rel=prefetch><link href=/welfare/css/chunk-281bf001.01c58546.css rel=prefetch><link href=/welfare/css/chunk-3195a346.af72490c.css rel=prefetch><link href=/welfare/css/chunk-447f9844.f11404c0.css rel=prefetch><link href=/welfare/css/chunk-5507bcee.29bf9e26.css rel=prefetch><link href=/welfare/css/chunk-593e752c.8f300845.css rel=prefetch><link href=/welfare/css/chunk-6dc8dbce.35eba226.css rel=prefetch><link href=/welfare/css/chunk-7169942a.3f8dd8f3.css rel=prefetch><link href=/welfare/css/chunk-789d3980.9fbf7749.css rel=prefetch><link href=/welfare/css/chunk-a144d7ae.855b4e1e.css rel=prefetch><link href=/welfare/css/chunk-a7320cc8.a794f702.css rel=prefetch><link href=/welfare/css/chunk-d7364742.be14d1e8.css rel=prefetch><link href=/welfare/css/gic-card.5913dfa5.css rel=prefetch><link href=/welfare/js/card-package.6156a01b.js rel=prefetch><link href=/welfare/js/card-package~gic-card.ca831d70.js rel=prefetch><link href=/welfare/js/chunk-033d13cc.e0934bb0.js rel=prefetch><link href=/welfare/js/chunk-0d4ebdfa.6bc4667c.js rel=prefetch><link href=/welfare/js/chunk-281bf001.0674a70b.js rel=prefetch><link href=/welfare/js/chunk-3195a346.d3bd62c1.js rel=prefetch><link href=/welfare/js/chunk-447f9844.97106da2.js rel=prefetch><link href=/welfare/js/chunk-5507bcee.627f2a91.js rel=prefetch><link href=/welfare/js/chunk-593e752c.3dd7295e.js rel=prefetch><link href=/welfare/js/chunk-6287d3af.57527a14.js rel=prefetch><link href=/welfare/js/chunk-6dc8dbce.10519e82.js rel=prefetch><link href=/welfare/js/chunk-7169942a.c8f9d906.js rel=prefetch><link href=/welfare/js/chunk-789d3980.1d47764f.js rel=prefetch><link href=/welfare/js/chunk-a144d7ae.201edd4c.js rel=prefetch><link href=/welfare/js/chunk-a7320cc8.3f410578.js rel=prefetch><link href=/welfare/js/chunk-d7364742.65170d2d.js rel=prefetch><link href=/welfare/js/chunk-db6a8f34.b441a76b.js rel=prefetch><link href=/welfare/js/gic-card.ae3d7883.js rel=prefetch><link href=/welfare/css/app.2296541b.css rel=preload as=style><link href=/welfare/js/app.9c9f9e61.js rel=preload as=script><link href=/welfare/js/chunk-vendors.e3f6565f.js rel=preload as=script><link href=/welfare/css/app.2296541b.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script>(function() {
var host = window.location.host;
document.write('<script src="//'+ (host == 'ideal.demogic.com' ? host : 'four.gicdev.com') + '/component-library/static/import-component.js?timestrap='+ new Date().getTime() +'"><\/script>')
})()</script><script src=/welfare/js/chunk-vendors.e3f6565f.js></script><script src=/welfare/js/app.9c9f9e61.js></script></body></html>
\ No newline at end of file
dist/js/chunk-28da0001.87a0a5a1.js → dist/js/chunk-281bf001.0674a70b.js
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-28da0001"],{"1e4b":function(t,e,a){"use strict";a.r(e);var c=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"welfare-index"},[a("div",{staticClass:"welfare-index-header"},[t._v("福利中心")]),a("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,c){return a("div",{key:c,class:"block b"+(c+1),on:{click:function(a){return t.$router.push(e.target)}}},[a("span",{staticClass:"title"},[t._v(t._s(e.title))]),t._m(0,!0)])})),0)])},n=[function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"target"},[a("i",{staticClass:"icon-right-circle iconfont-welfare4"})])}],i=a("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(a("ee36"),a("2877")),u=Object(s["a"])(l,c,n,!1,null,"45a2385e",null);e["default"]=u.exports},"7c79":function(t,e,a){},ee36:function(t,e,a){"use strict";a("7c79")},f9e4:function(t,e,a){"use strict";a.d(e,"b",(function(){return c})),a.d(e,"a",(function(){return n}));a("6c7b"),Array(31).fill().map((function(t,e){return{label:"".concat(e+1,"号"),value:"".concat(e+1)}})),Array(28).fill().map((function(t,e){return{label:"".concat(e+1,"号"),value:"".concat(e+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,e){return{label:"".concat(e+1,"月"),value:"".concat(e+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-281bf001"],{"1e4b":function(t,e,a){"use strict";a.r(e);var c=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"welfare-index"},[a("div",{staticClass:"welfare-index-header"},[t._v("福利中心")]),a("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,c){return a("div",{key:c,class:"block b"+(c+1),on:{click:function(a){return t.$router.push(e.target)}}},[a("span",{staticClass:"title"},[t._v(t._s(e.title))]),t._m(0,!0)])})),0)])},n=[function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"target"},[a("i",{staticClass:"icon-right-circle iconfont-welfare4"})])}],i=a("f9e4"),r={name:"Index",data:function(){return{wfTypes:i["b"]}}},l=r,s=(a("ee36"),a("2877")),u=Object(s["a"])(l,c,n,!1,null,"45a2385e",null);e["default"]=u.exports},"7c79":function(t,e,a){},ee36:function(t,e,a){"use strict";a("7c79")},f9e4:function(t,e,a){"use strict";a.d(e,"b",(function(){return c})),a.d(e,"a",(function(){return n}));a("6c7b"),Array(31).fill().map((function(t,e){return{label:"".concat(e+1,"号"),value:"".concat(e+1)}})),Array(28).fill().map((function(t,e){return{label:"".concat(e+1,"号"),value:"".concat(e+1)}})).concat({label:"月底",value:"0"}),Array(12).fill().map((function(t,e){return{label:"".concat(e+1,"月"),value:"".concat(e+1)}}));var c=[{title:"实物礼品",target:"/gift-manage/real-gift",code:"w-real-gifts"},{title:"虚拟礼品",target:"/gift-manage/virtual-gift",code:"w-virtual-gifts"},{title:"GIC 卡券",target:"/gic-card/list",code:"w-gic-card"},{title:"GIC 卡券包",target:"/card-package/list",code:"w-card-package"}],n={1:"增加",2:"减少"}}}]);
\ No newline at end of file
dist/js/chunk-vendors.be22c79d.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.1fea2437.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.ae3d7883.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -5,16 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon2.ico">
<link rel="stylesheet" href="<%= BASE_URL %>static/css/index.css"><!-- element css -->
<link href="https://cdn.bootcss.com/element-ui/2.12.0/theme-chalk/index.css" rel="stylesheet">
<link href="//at.alicdn.com/t/font_1434755_89ndzcq2ndm.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1418963_hrpaaxicjis.css" />
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1393418_z4h4445tiwe.css" />
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_2349215_zw94rco4ss.css" /><!-- 福利中心icon -->
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1418963_8ssgac9p1n7.css" /> <!-- 组件库icon -->
<script src="//at.alicdn.com/t/font_1418963_8ssgac9p1n7.js"></script> <!-- 组件库icon svg -->
<link rel="stylesheet" type="text/css" href="//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.58.5.css" />
<script src="//at.alicdn.com/t/font_1418963_hrpaaxicjis.js"></script>
<link href="//at.alicdn.com/t/font_1434755_up9fc92yhi.css" rel="stylesheet"><!-- 营销icon -->
<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_2349215_1s8bd0r1t2ri.css" /><!-- 福利中心icon -->
<!-- <title>达摩网络GIC——连锁零售商业互联网+，终极解决方案</title> -->
<title>福利中心</title>
</head>
......@@ -24,33 +16,11 @@
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
<script src="//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib-4.0/vue-router/3.0.3/vue-router.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/lib-4.0/element-ui/2.10.0/index.js"></script> -->
<!-- 4.0 -->
<script src="//web-1251519181.file.myqcloud.com/components/base.1.0.0.17.js"></script><!-- 公共方法 -->
<script src="//web-1251519181.file.myqcloud.com/components/layout.1.2.61.js"></script><!-- 布局组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/input.2.0.20.js"></script><!-- input !!3.0组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/store-select.1.1.92.js"></script><!-- 门店选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/goods-selector.1.0.51.js"></script><!-- 商品选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/card-select.1.0.34.js"></script><!-- 卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js"></script><!-- 链接小工具 -->
<script src="//web-1251519181.file.myqcloud.com/components/export-data.1.1.2.js"></script><!-- 数据导出 -->
<script src="//web-1251519181.file.myqcloud.com/components/integral-select.1.0.26.js"></script><!-- 积分选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/rule-engine.1.0.94.js"></script><!-- 规则引擎 -->
<script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script><!-- 分页器 -->
<script src="//web-1251519181.file.myqcloud.com/components/perm-button.1.0.1.js"></script><!-- 权限项按钮 -->
<script src="//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js"></script><!-- 步骤条 -->
<script src="//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.7.js"></script><!-- 图片上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
<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.4.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.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.18.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.13.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
<script>
(function() {
var host = window.location.host;
document.write('<script src="//'+ (host == 'ideal.demogic.com' ? host : 'four.gicdev.com') + '/component-library/static/import-component.js?timestrap='+ new Date().getTime() +'"><\/script>')
})()
</script>
</body>
</html>
src/App.vue
......@@ -5,6 +5,8 @@
</template>
<script>
import fetch from '@/api/performance.js';
const { getLogisticsCompany } = fetch;
export default {
name: 'App',
data() {
......@@ -13,8 +15,15 @@ export default {
};
},
mounted() {
this.getLogisticsCompany();
this.$store.commit('updateMainHeight', document.body.offsetHeight - 180);
},
methods: {
async getLogisticsCompany() {
let { result } = await getLogisticsCompany();
this.$store.commit('setLogisticsCompany', result || []);
}
},
watch: {
'$route': {
handler(val){
......
src/api/performance.js
......@@ -54,7 +54,8 @@ let performance = {
url: '/delivery-order/close',
method: 'post',
useFormData: true
}
},
getLogisticsCompany: '/logistics/get-company'
};
performance = getFetch(performance, welfarePrefix);
......
src/components/libs/switch-page.vue
......@@ -94,6 +94,8 @@ export default {
},
visible() {
let routes = [ '/gic-card/list', '/card-package/list', '/gift-manage/real-gift', '/gift-manage/virtual-gift' ];
// 因为会挡住分页控件，ui考虑之后决定砍掉本控件
routes = [];
return routes.some(i => i.indexOf(this.$route.path) > -1);
}
},
......
src/components/member-info/index.vue
......@@ -2,7 +2,7 @@
<div class="member-info" :style="`height:${height}px`">
<dm-preview-img
class="img"
:img="memberImage"
:img="memberImage || require('@/assets/images/default-memberImg.png')"
:width="width"
:height="height">
</dm-preview-img>
......@@ -54,4 +54,4 @@ export default {
font-size: 12px;
}
}
</style>
\ No newline at end of file
</style>
src/components/stock-list/welfare-item.vue
......@@ -178,6 +178,9 @@ export default {
line-height: 40px;
float: right;
cursor: pointer;
&:hover {
color: $blue;
}
}
}
.content {
......
src/mixins/table.js
......@@ -9,6 +9,7 @@ export const page = {
this.getTableList();
},
handleSizeChange(val) {
this.listParams.currentPage = 1;
this.listParams.pageSize = val;
this.getTableList();
},
......
src/store/index.js
......@@ -7,6 +7,7 @@ Vue.use(Vuex);
export default new Vuex.Store({
state: {
logisticsCompany: [],
lock: false, // 当没有权限或者过期限制时锁住所有操作 -- 暂不使用该属性
loading: false, // 全局loading
defaultAreaId: '', // 默认的子应用id
......@@ -23,6 +24,9 @@ export default new Vuex.Store({
showCornerCanUseApp: false // 右下角弹出可用app列表
},
mutations: {
setLogisticsCompany(state, val) {
state.logisticsCompany = val;
},
updateShowCornerCanUseApp(state, showCornerCanUseApp) {
state.showCornerCanUseApp = showCornerCanUseApp;
},
......
src/utils/request.js
......@@ -28,22 +28,22 @@ import { SUCCESS_CODE, origin } from '@/config';
* http状态码处理
* @param {*} code ui目前只处理如下code
*/
function handlerErr(code) {
if (process.env['NODE_ENV'] === 'development') { // eslint-disable-line
return;
}
switch (code) {
case 404:
window.location.href = origin + '/damo-system/404';
break;
case 403:
window.location.href = origin + '/damo-system/403';
break;
case 500:
window.location.href = origin + '/damo-system/500';
break;
}
}
// function handlerErr(code) {
// if (process.env['NODE_ENV'] === 'development') { // eslint-disable-line
// return;
// }
// switch (code) {
// case 404:
// window.location.href = origin + '/damo-system/404';
// break;
// case 403:
// window.location.href = origin + '/damo-system/403';
// break;
// case 500:
// window.location.href = origin + '/damo-system/500';
// break;
// }
// }
axios.defaults.baseURL = origin;
const request = (opt, params, restObj) => {
......@@ -144,9 +144,9 @@ const request = (opt, params, restObj) => {
}
resolve(resp);
}).catch(error => {
if (error) {
handlerErr(error.response.status);
}
// if (error) {
// handlerErr(error.response.status);
// }
Message({
message: (error.response.data.message || '数据加载失败').slice(0, 300),
type: 'warning'
......
src/views/card/card-package/form.vue
......@@ -123,12 +123,10 @@
<el-col :span="4">{{ item.remainedStock }}</el-col>
<el-col :span="3">
<!-- 1:已生效,2:已删除,3:已过期 -->
<span v-if="item.welfareStatus == 1"
class="state-point state-point-success">已生效</span>
<span v-else-if="item.welfareStatus == 2"
class="state-point state-point-error">已删除</span>
<span v-else
class="state-point state-point-default">已过期</span>
<!-- <span v-if="item.statusFlag == 1" class="state-point state-point-success">已生效</span>
<span v-else-if="item.statusFlag == 2" class="state-point state-point-error">已删除</span>
<span v-else class="state-point state-point-default">已过期</span> -->
<span v-html="renderStatus(item)"></span>
</el-col>
<el-col :span="3">
<el-button @click="delCard(item)"
......@@ -142,13 +140,8 @@
</div>
</el-form-item>
<el-form-item>
<el-button type="primary"
v-if="isAdd"
@click="addForm">保存并添加卡券</el-button>
<el-button type="primary"
:disabled="ruleForm.packageStock == info.packageStock"
v-else
@click="editForm">保存</el-button>
<el-button type="primary" v-if="isAdd" @click="addForm">保存并添加卡券</el-button>
<el-button type="primary" v-else @click="editForm">保存</el-button>
</el-form-item>
</el-form>
<div class="hidden">
......@@ -169,7 +162,7 @@
<script>
import { showConfirm } from '@/utils/common';
import { getTimesByReq } from '@/utils/common.js';
import { cardType } from '@/config/mapping/gic-card';
import { cardType, cardStatus, mappingCardStatus } from '@/config/mapping/gic-card';
import { formatDateTimeByType } from '@/utils/index.js';
import fetch from '@/api/card-package.js';
const { addPackages, editPackages, getPackageDetail, addPackageItem, delPackageItem } = fetch;
......@@ -267,6 +260,36 @@ export default {
}
},
methods: {
renderStatus(row) {
if(row.welfareStatus == 2) {
return '<span class="state-point state-point-error">已删除</span>';
} else if(row.welfareStatus == 3) {
return '<span class="state-point state-point-error">已过期</span>';
} else {
let { _status } = mappingCardStatus(row);
let _cl = '';
// 1未生效、2使用中、3已过期、4已禁用
switch (_status) {
case 1:
_cl = 'state-point-loading-scale'; // 未生效 转换成使用中
_status = 2;
break;
case 2:
_cl = 'state-point-loading-scale'; // 使用中
break;
case 3:
_cl = 'state-point-default';
break;
case 4:
_cl = 'state-point-error'; // 已禁用已过期
break;
default:
_cl = 'state-point-default';
break;
}
return `<span class="state-point ${_cl}">${cardStatus[_status] || '未知状态'}</span>`;
}
},
getRelationId() {
getRelationId().then(res => {
this.couponPackageId = res.result;
......@@ -306,11 +329,11 @@ export default {
this.cardLoading = false;
this.refreshCouponList();
let callbackId = this.$route.query.callbackId;
if (callbackId) {
if(callbackId) {
// 有callbackId参数时，认为入口是福利选择器组件
// 操作完成后需要修改localStorage中的welfareCreateCallback，以触发福利选择器内部数据更新
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[ callbackId ] = false;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
obj[ callbackId ] = true;
obj[callbackId] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
}
}).catch(() => {
......@@ -357,8 +380,7 @@ export default {
if (this.loading) {
return;
}
if (!this.$refs.accg.validate()) return;
this.$refs.accg.save();
if(!this.$refs.accg.validate()) return;
this.$refs.ruleForm.validate((valid) => {
if (!valid) {
PublicMethods.jumpToFormError(); // eslint-disable-line
......@@ -373,27 +395,33 @@ export default {
params.operAuth = params.operAuth.join(',');
}
this.loading = true;
addPackages(params).then(res => {
this.loading = false;
this.$tips({ message: `${this.isAdd ? '新建' : '编辑'}成功`, type: 'success' });
if (this.isAdd) {
this.$store.commit('updateShowCornerCanUseApp', true);
let callbackId = this.$route.query.callbackId;
if (callbackId) {
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[ callbackId ] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
this.$refs.accg.save().then(res=>{
addPackages(params).then(res => {
this.loading = false;
this.$tips({ message: `${ this.isAdd ? '新建' : '编辑' }成功`, type: 'success' });
if(this.isAdd) {
this.$store.commit('updateShowCornerCanUseApp', true);
let callbackId = this.$route.query.callbackId;
if(callbackId) {
// 有callbackId参数时，认为入口是福利选择器组件
// 操作完成后需要修改localStorage中的welfareCreateCallback，以触发福利选择器内部数据更新
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[callbackId] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
}
}
}
this.$router.push('/card-package/list');
// if (!this.isAdd) {
// this.$router.push('/card-package/list');
// } else {
// this.isEcho = true;
// this.$router.push(`/card-package/edit?id=${res.result}`);
// }
}).finally(() => {
this.loading = false;
this.$router.push('/card-package/list');
// if(!this.isAdd) {
// this.$router.push('/card-package/list');
// } else {
// this.isEcho = true;
// this.$router.push(`/card-package/edit?id=${res.result}`);
// }
}).finally(() => {
this.loading = false;
});
}).catch(err=>{
this.$message.error(err.message);
});
}
});
......
src/views/card/gic-card/card-form.js
......@@ -58,8 +58,8 @@ const _ruleForm1 = {
remarkName: '', // 备注名
subTitle: '', // 副标题
color: '#3970b5', // 卡券颜色
denomination: 0, // 优惠金额 抵金券0时存在
costPrice: 0, // 成本费用 折扣券1、兑换券2存在
denomination: '', // 优惠金额 抵金券0时存在
costPrice: '', // 成本费用 折扣券1、兑换券2存在
// manualGetFlag: 0,
// code类型↓
customCodeFlag: 0,
......@@ -291,8 +291,8 @@ export default {
loading: false,
active: 1,
uploadUrl,
zmImg: [], // 转赠图片
stImg: [], // 首图图片
zmImg: [ { url: 'https://pic01-10001430.image.myqcloud.com/13597/1622599355173_TAcQN.png', fileId: '13597/1622599355173_TAcQN.png' } ], // 转赠图片
stImg: [ { url: 'https://pic01-10001430.image.myqcloud.com/13597/1622599673145_IeGHg.png', fileId: '13597/1622599673145_IeGHg.png' } ], // 首图图片
stockType: [], // 库存使用类型（0:占用,1:动态 , 2占用+动态）
prefix,
couponId: '', // gic-card 新建时就生成couponId
......@@ -388,6 +388,10 @@ export default {
created() {
const breadName = this.isAdd || this.isCopy ? '新建卡券' : '编辑卡券';
this.$emit('updateBread', [ { breadName: '卡券列表', breadPath: '/gic-card/list' }, { breadName } ]);
this.ruleForm1.giveImage = this.zmImg[0].url;
this.ruleForm1.giveImageField = this.zmImg[0].fileId;
this.ruleForm1.giveBannerImage = this.stImg[0].url;
this.ruleForm1.giveBannerImageField = this.stImg[0].fileId;
},
mounted() {
if (this.currentAreaId) {
......@@ -524,7 +528,14 @@ export default {
if (operAuthType == 2 && !operAuth.length) {
reject({ message: '请选择部分分组账号' });
}
resolve(target);
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save().then((res) => {
if (res.code == '0000') {
resolve(target);
} else {
reject({ message: res.message });
}
});
}
if (target === 3) {
const { xxsy, gicmall } = this;
......@@ -713,8 +724,8 @@ export default {
if (this.loading) {
return;
}
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save();
// if(!this.$refs.accg.validate()) return;
// this.$refs.accg.save();
let params = { ...this.ruleForm1, ...this.ruleForm2, goodsSearchId: this.goodsSearchId };
try {
params.couponId = this.couponId; // 主键在一进来页面的时候就已经确定
......@@ -851,6 +862,8 @@ export default {
this.$store.commit('updateShowCornerCanUseApp', true);
let callbackId = this.$route.query.callbackId;
if(callbackId) {
// 有callbackId参数时，认为入口是福利选择器组件
// 操作完成后需要修改localStorage中的welfareCreateCallback，以触发福利选择器内部数据更新
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[callbackId] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
......@@ -871,6 +884,7 @@ export default {
zmSuccess(obj) {
console.log(11111);
this.zmImg = [ { url: obj.res.result.url, fileId: obj.res.result.fileId } ];
console.log(this.zmImg);
this.ruleForm1.giveImage = obj.res.result.url;
this.ruleForm1.giveImageField = obj.res.result.fileId;
},
......
src/views/card/gic-card/card-form.vue
......@@ -43,12 +43,12 @@
<!-- 抵金券 -->
<el-form-item prop="denomination" label="优惠金额" v-if="ruleForm1.cardType === 0">
<dm-input-amount style="width:140px;" v-model="ruleForm1.denomination" :max="10000000" placeholder="金额需大于0" :precison="2" :min="0" ></dm-input-amount>
<dm-input-amount style="width:140px;" v-model="ruleForm1.denomination" :max="10000000" placeholder="金额需大于0" :precison="2" :min="0.01" ></dm-input-amount>
<!-- <span class="tips">请输入大于0的数字</span> -->
</el-form-item>
<!-- 折扣券 -->
<el-form-item prop="denomination" label="优惠折扣" v-if="ruleForm1.cardType === 1">
<el-input-number style="width:120px;" v-model="ruleForm1.denomination" :max="9.9" placeholder="请填写1-9.9之间的数字" controls-position="right" :precision="1" :step="0.1" :min="0" ></el-input-number>
<el-input-number style="width:120px;" v-model="ruleForm1.denomination" :max="9.9" placeholder="请填写1-9.9之间的数字" controls-position="right" :precision="1" :step="0.1" :min="1" ></el-input-number>
<span class="tips">折</span>
</el-form-item>
<!-- 兑换券 !!! 比微信卡券多的内容 -->
......@@ -57,23 +57,41 @@
</el-form-item>
<!-- 抵金券、兑换券 -->
<el-form-item prop="costPrice" label="成本费用" v-if="ruleForm1.cardType !== 1">
<dm-input-amount style="width:140px;" v-model="ruleForm1.costPrice" placeholder="金额需大于0" :precision="2" :min="0" ></dm-input-amount>
<dm-input-amount style="width:140px;" v-model="ruleForm1.costPrice" placeholder="金额需大于0" :precision="2" :min="0.01" ></dm-input-amount>
<!-- <span class="tips">请输入大于0的数字（限制两位小数）</span> -->
</el-form-item>
<el-form-item label="最低适用商品件数" prop="goodsDiscountCheckLower">
<el-radio v-model="useConditionLimit.goodsDiscountCheckLower" :label="0">不限</el-radio>
<span class="ml15">
<el-radio v-model="useConditionLimit.goodsDiscountCheckLower" :label="1">
<el-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheckLower" v-model="useConditionLimit.goods_adapt_number_min_limit" :precision="0" :step="1" :min="1"></el-input-number> 件 &nbsp;
<!-- <dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheckLower" v-model="useConditionLimit.goods_adapt_number_min_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number> -->
</el-radio>
<dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheckLower" v-model="useConditionLimit.goods_adapt_number_min_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number>
</span>
</el-form-item>
<el-form-item label="最高适用商品件数" prop="goodsDiscountCheck">
<el-radio v-model="useConditionLimit.goodsDiscountCheck" :label="0">不限</el-radio>
<span class="ml15">
<el-radio v-model="useConditionLimit.goodsDiscountCheck" :label="1">
<el-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheck" v-model="useConditionLimit.goods_adapt_number_max_limit" :precision="0" :step="1" :min="1"></el-input-number> 件 &nbsp;
<!-- <dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheck" v-model="useConditionLimit.goods_adapt_number_max_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number> -->
</el-radio>
<dm-input-number class="w110" controls-position="right" :disabled="!useConditionLimit.goodsDiscountCheck" v-model="useConditionLimit.goods_adapt_number_max_limit" :precision="0" :step="1" :min="1">
<template slot="append">
件
</template>
</dm-input-number>
</span>
</el-form-item>
<el-form-item label="code类型">
......@@ -200,7 +218,7 @@
</el-form-item>
<el-form-item label="首图链接设置" prop="giveBannerJumpUrl">
<el-checkbox v-model="checked" @change="onShow" />
<span class="op-btn ml5" style="cursor:pointer" @click="onShow(true)">首图链接 <i class="el-icon-arrow-right"></i></span>
<span class="op-btn ml5" style="cursor:pointer;color:#303133" @click="onShow(true)">首图链接 <i class="el-icon-arrow-right"></i></span>
<span v-if="checked && (linkData.name || linkData.url)" class="gray03 ml10" :title="linkData.url">【{{ linkData.name || '--' }}】【{{ linkData.url || '--' }}】</span>
</el-form-item>
<el-form-item label="卡券转赠规则" prop="giveRule" v-show="ruleForm1.giveFlag === 1">
......@@ -215,7 +233,7 @@
<span v-if="(linkData2.name || linkData2.url)" class="gray03 ml10" :title="linkData2.url">【{{ linkData2.name || '--' }}】【{{ linkData2.url || '--' }}】</span>
</template> -->
<el-checkbox v-model="ruleForm1.cardJumpFlag" :true-label="1" :false-label="0" @change="(val) => val && $refs.link2.onShow()" />
<span class="op-btn ml5" style="cursor:pointer" @click="$refs.link2.onShow(),ruleForm1.cardJumpFlag=1">跳转链接 <i class="el-icon-arrow-right"></i></span>
<span class="op-btn ml5" style="cursor:pointer;color:#303133" @click="$refs.link2.onShow(),ruleForm1.cardJumpFlag=1">跳转链接 <i class="el-icon-arrow-right"></i></span>
<span v-if="ruleForm1.cardJumpFlag && (linkData2.name || linkData2.url)" class="gray03 ml10" :title="linkData2.url">【{{ linkData2.name || '--' }}】【{{ linkData2.url || '--' }}】</span>
<p class="tips">* 开启后小程序卡券详情将对应路径的跳转按钮</p>
</el-form-item>
......
src/views/card/gic-card/card-info.js
......@@ -122,7 +122,6 @@ export default {
return;
}
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save();
this.$refs.ruleForm.validate((valid) => {
if (!valid) {
PublicMethods.jumpToFormError(); // eslint-disable-line
......@@ -143,17 +142,21 @@ export default {
// return;
// }
this.$emit('updateLoading', true);
updateCard(params).then(res => {
this.$emit('updateLoading', false);
this.loading = false;
// this.result.info = this.needCheck ? '卡券保存并提交审核，请尽快通知审核人员进行审核。' : '卡券保存成功';
this.result.info = '卡券保存成功';
this.result.title = '操作成功';
this.result.visible = true;
this.submitType = 1;
}).finally(() => {
this.$emit('updateLoading', false);
this.loading = false;
this.$refs.accg.save().then(res=>{
updateCard(params).then(res => {
this.$emit('updateLoading', false);
this.loading = false;
// this.result.info = this.needCheck ? '卡券保存并提交审核，请尽快通知审核人员进行审核。' : '卡券保存成功';
this.result.info = '卡券保存成功';
this.result.title = '操作成功';
this.result.visible = true;
this.submitType = 1;
}).finally(() => {
this.$emit('updateLoading', false);
this.loading = false;
});
}).catch(err=>{
this.$message.error(err.message);
});
}
});
......
src/views/card/gic-card/card-info.vue
......@@ -109,9 +109,9 @@
<el-input show-word-limit v-if="isEdit" type="textarea" :rows="4" v-model="ruleForm.adaptStoreExplain" class="w500" :maxlength="50" placeholder="选填" />
<div v-if="isInfo" class="word-break">{{ ruleForm.adaptStoreExplain || '--' }}</div>
</el-form-item>
<el-form-item>
<!-- <el-form-item>
<el-button type="primary" @click="submitForm" v-if="!isInfo">确认保存</el-button>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<div class="common-title mb25 mt60" id="f3">适用信息</div>
......@@ -159,6 +159,9 @@
<ul class="floor">
<li v-for="(item, idx) in floor" :key="idx" :class="{ active: item.targetId === floorId }" @click="toFloor(item)"><span>{{ item.name }}</span></li>
</ul>
<div class="fixed-bottom">
<el-button type="primary" @click="submitForm" v-if="!isInfo">确认保存</el-button>
</div>
<result-dialog :dialog-visible.sync="result.visible" :title="result.title" :info="result.info" @handleClose="handleResClose">
<el-button slot="footer" class="mt30" @click="handleResClose">关闭</el-button>
</result-dialog>
......@@ -186,7 +189,7 @@ export default cardInfo;
}
}
.card-info {
padding: 24px 20px;
padding: 24px 20px 40px;
position: relative;
.title {
font-size:14px;
......
src/views/card/gic-card/card-list.vue
......@@ -278,6 +278,8 @@ export default {
_cl = 'state-point-loading-scale'; // 使用中
break;
case 3:
_cl = 'state-point-default';
break;
case 4:
_cl = 'state-point-error'; // 已禁用已过期
break;
......
src/views/gift-manage/module/select-pickup-store.vue
......@@ -162,6 +162,10 @@ export default {
},
created() {
this.init();
// 组件创建后，如果this.data.shopSelectType == ''时，需要主动触发一下onTypeChange事件，将shopSelectType = 0传给调用方
if (typeof this.data.shopSelectType != 'number' || this.data.shopSelectType == '') {
this.onTypeChange(0);
}
},
mounted() {
document.addEventListener('click', this.onClosePopover, true);
......
src/views/gift-manage/real-gift.vue
......@@ -59,7 +59,7 @@
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<dm-preview-img :img="scope.row.giftImgUrl[0]" style="display:inline-block;border: 1px solid #dcdfe6;border-radius:4px;" width="58" height="58"></dm-preview-img>
<div class="text">
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
<p class="goods-descript">
......@@ -98,7 +98,9 @@
<p class="stock-box">
<span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
<span v-else>{{ scope.row.minCostPrice.toFixed(2) }}-{{ scope.row.maxCostPrice.toFixed(2) }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整成本" placement="top" open-delay="200">
<i class="el-icon-edit-outline inline-block ml5" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</template>
</el-table-column>
......@@ -125,7 +127,9 @@
<i class="el-icon-question inline-block mr4" slot="reference" style="color:#909399"></i>
</el-popover>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整库存" placement="top" open-delay="200">
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</div>
</template>
......@@ -174,11 +178,7 @@
</template>
</el-table-column>
</el-table>
<div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
<div class="pagination">
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="query.pageSize" layout="total, sizes, prev, pager, next" :total="total" v-if="total != 0"> </dm-pagination>
</div>
</div>
<dm-pagination style="text-align: right" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="query.pageSize" layout="total, sizes, prev, pager, next" :total="total"> </dm-pagination>
</div>
</div>
</div>
......@@ -319,17 +319,19 @@ export default {
giftPage(params).then(res =>{
this.tableData = res.result.result;
this.tableData.forEach(item =>{
item.giftImgUrl = typeof item.giftImgUrl == 'string' ? item.giftImgUrl.split(',') : [];
this.$set(item, 'visible', false);
});
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
handleSizeChange(value){
this.query.currentPage = 1;
this.query.pageSize = value;
this.getTableList();
},
handleCurrentChange(value){
this.query.currentPage = value;
this.query.pageSize = 1;
this.getTableList();
},
// 展开与收起
......@@ -722,4 +724,4 @@ export default {
border-color: #2f54eb;
background-color: #fff;
}
</style>
\ No newline at end of file
</style>
src/views/gift-manage/sales-return-setting.vue
<template>
<div class="p20" v-loading="loading">
<div class="p20 pt30" v-loading="loading">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" style="min-height:400px;">
<el-form-item label="收货自动加库存" prop="backStockFlag">
<el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.backStockFlag"></el-switch>
<div class="gray03 fz12">开启表示在退货单同意收货后，福利中心可占库存将会增加</div>
</el-form-item>
<el-form-item>
<el-form-item class="mt50">
<el-button type="primary" @click="submitForm">保存</el-button>
<span class="ml10 gray02" v-if="ruleForm.updateTime">最近修改：{{formatDateTimeByType(ruleForm.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</span>
</el-form-item>
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -72,7 +72,7 @@
<div slot="description">
<div class="pickup-upload">
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<dm-upload-file
<!-- <dm-upload-file
width="232"
class="inline-block ml10"
:show-file-list="false"
......@@ -84,7 +84,6 @@
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">
<!-- <el-button style="margin-right: 30px" type="text" @click="downloadFile">下载文件模板</el-button> -->
<el-popover trigger="hover" placement="right" popper-class="upload-popper">
<el-button slot="reference" type="text" style="font-size:12px;line-height:17px">查看导入规则</el-button>
<div class="upload-tip-text">
......@@ -95,9 +94,30 @@
</div>
</el-popover>
</span>
<!-- <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div> -->
<!-- <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div> -->
</dm-upload-file>
</dm-upload-file> -->
<el-upload
ref="uploadFile"
class="inline-block ml10"
:show-file-list="false"
:auto-upload="false"
:action="uploadAction"
accept=".xls,.xlsx"
:on-change="beforeUploadFile"
: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>
</el-upload>
<span class="ml20 upload-tip inline-block">
<el-popover trigger="hover" placement="right" popper-class="upload-popper">
<el-button slot="reference" type="text" style="font-size:12px;line-height:17px">查看导入规则</el-button>
<div class="upload-tip-text">
<p style="margin-bottom:10px">1.请按照顺序维护表头，所有变量均为必填项;</p>
<p style="margin-bottom:10px">2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p style="margin-bottom:10px">3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
<p>4.正在异步上传处理中，我们将按照顺序分批次（5000/1批次）更新库存，请稍候刷新查看库存上传结果;</p>
</div>
</el-popover>
</span>
<div class="pickup-list">
<p class="pickup-list-name" v-if="uploadFile.name">
<i class="iconfont-welfare4 icon-wenjian1 file-icon"></i>
......@@ -137,13 +157,13 @@
<div class="form-section">
<h3>售后服务</h3>
<el-form-item prop="refundFlag" label="支持买家申请退货">
<template>
<div>
<el-radio v-model="goodsForm.refundFlag" :label="1">支持</el-radio>
<el-radio v-model="goodsForm.refundFlag" :label="0">不支持</el-radio>
</div>
<span class="tip-warm" style="display:block">若商品不支持退货，则该礼品出库后不支持生成退货单</span>
</template>
<el-radio-group disabled :value="goodsForm.refundFlag">
<el-radio :label="1">支持</el-radio>
<el-radio :label="0">不支持</el-radio>
</el-radio-group>
<div>
</div>
<span class="tip-warm" style="display:block">若商品不支持退货，则该礼品出库后不支持生成退货单</span>
</el-form-item>
</div>
<div class="form-section mb56">
......@@ -355,6 +375,7 @@ export default {
},
beforeUploadFile(file, fileList){
this.uploadFile.name = file.name;
this.$refs.uploadFile.uploadFiles = [ file ];
},
downloadFile() {
if(!this.isEdit){
......@@ -505,7 +526,7 @@ export default {
} // 礼品主图
this.goodsForm.giftDescrption = resResult.giftDescrption; // 礼品详情
this.goodsForm.template = resResult.template;
this.goodsForm.refundFlag = resResult.refundFlag; // 是否支持退货
this.goodsForm.refundFlag = 0; // 虚拟礼品不支持退货
} else {
this.$message.error(res.message);
}
......@@ -532,7 +553,7 @@ export default {
this.image.forEach((item, index) =>{
handelImage[index] = item.url;
});
this.goodsForm.giftImages = handelImage.join('');
this.goodsForm.giftImages = handelImage.join(',');
},
// 删除图片 返回图片列表的索引 你可以根据这个索引去找对应图片的id
deleteImage(i) {
......@@ -541,7 +562,7 @@ export default {
this.image.forEach((item, index) =>{
handelImage[index] = item.url;
});
this.goodsForm.giftImages = handelImage.join('');
this.goodsForm.giftImages = handelImage.join(',');
},
sortImg(val) {
this.image = val;
......@@ -549,7 +570,7 @@ export default {
this.image.forEach((item, index) =>{
handelImage[index] = item.url;
});
this.goodsForm.giftImages = handelImage.join('');
this.goodsForm.giftImages = handelImage.join(',');
},
handleChange(val) {
this.goodsForm.giftDescrption = val;
......@@ -566,13 +587,11 @@ export default {
// return false;
// }
if(!this.$refs.accg.validate()) return;
this.$refs.accg.save();
this.$refs[goodsForm].validate(valid => {
if (!valid){
PublicMethods.jumpToFormError(); // eslint-disable-line
return;
}else{
// this.btnLoading = true;
this.$emit('updateLoading');
let params = {
giftId: this.giftId,
......@@ -601,37 +620,37 @@ export default {
template: this.goodsForm.template,
// template: this.template,
};
this.btnLoading = true;
if (this.isEdit) {
// params.giftId = this.giftId;
giftUpdate(params).then(res =>{
if (res.code === '0000') {
this.$refs.accg.save().then(res=>{
this.btnLoading = true;
if (this.isEdit) {
giftUpdate(params).then(res =>{
this.$router.push({ path: '/gift-manage/virtual-gift' });
this.$refs.uploadFile.submit();
}).finally(() => {
this.btnLoading = false;
} else {
this.btnLoading = false;
this.$message.error(res.message);
}
}).finally(() => this.$emit('updateLoading'));
}else{
// params.giftId = '';
giftSave(params).then(res =>{
if (res.code === '0000') {
this.$store.commit('updateShowCornerCanUseApp', true);
this.$router.push({ path: '/gift-manage/virtual-gift' });
this.btnLoading = false;
} else {
this.btnLoading = false;
this.$message.error(res.message);
this.$emit('updateLoading');
});
}else{
giftSave(params).then(res =>{
let callbackId = this.$route.query.callbackId;
if(callbackId) {
// 有callbackId参数时，认为入口是福利选择器组件
// 操作完成后需要修改localStorage中的welfareCreateCallback，以触发福利选择器内部数据更新
let obj = JSON.parse(localStorage.getItem('welfareCreateCallback') || '{}');
obj[callbackId] = true;
localStorage.setItem('welfareCreateCallback', JSON.stringify(obj));
}
}
}).finally(() => this.$emit('updateLoading'));
}
this.$store.commit('updateShowCornerCanUseApp', true);
this.$router.push({ path: '/gift-manage/virtual-gift' });
this.$refs.uploadFile.submit();
}).finally(() => {
this.$emit('updateLoading');
this.btnLoading = false;
});
}
}).catch(err=>{
this.$message.error(err.message);
});
}
});
}
......
src/views/gift-manage/virtual-gift.vue
......@@ -59,7 +59,7 @@
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<dm-preview-img :img="scope.row.giftImgUrl[0]" style="display:inline-block;border: 1px solid #dcdfe6;border-radius:4px;" width="58" height="58"></dm-preview-img>
<div class="text">
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
<p class="goods-descript">
......@@ -98,7 +98,9 @@
<p class="stock-box">
<span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
<span v-else>{{ scope.row.minCostPrice.toFixed(2) }}-{{ scope.row.maxCostPrice.toFixed(2) }}</span>
<i class="el-icon-edit-outline" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整成本" placement="top" open-delay="200">
<i class="el-icon-edit-outline" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</template>
</el-table-column>
......@@ -125,7 +127,9 @@
<i class="el-icon-question inline-block mr4" slot="reference" style="color:#909399"></i>
</el-popover>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整库存" placement="top" open-delay="200">
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</div>
</template>
......@@ -178,11 +182,7 @@
</template>
</el-table-column>
</el-table>
<div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
<div class="pagination">
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="query.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="query.pageSize" layout="total, sizes, prev, pager, next" :total="total" v-if="total != 0"> </dm-pagination>
</div>
</div>
<dm-pagination style="text-align: right" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="query.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="query.pageSize" layout="total, sizes, prev, pager, next" :total="total"> </dm-pagination>
</div>
</div>
</div>
......@@ -346,17 +346,19 @@ export default {
giftPage(params).then(res =>{
this.tableData = res.result.result;
this.tableData.forEach(item =>{
item.giftImgUrl = typeof item.giftImgUrl == 'string' ? item.giftImgUrl.split(',') : [];
this.$set(item, 'visible', false);
});
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
handleSizeChange(value){
this.query.currentPage = 1;
this.query.pageSize = value;
this.getTableList();
},
handleCurrentChange(value){
this.query.currentPage = value;
this.query.pageSize = 1;
this.getTableList();
},
closeUploadDetail(){
......@@ -795,4 +797,4 @@ export default {
border-color: #2f54eb;
background-color: #fff;
}
</style>
\ No newline at end of file
</style>
src/views/performance-manage/components/logistics-delivery-dialog.vue
......@@ -7,8 +7,9 @@
</el-form-item>
<el-form-item label="物流公司" prop="logisticsCompanyCode">
<el-select style="width:100%" placeholder="请选择" v-model="form.logisticsCompanyCode">
<el-option label="顺丰速递" value="SF"></el-option>
<el-option label="中通快递" value="STO"></el-option>
<!-- <el-option label="顺丰速递" value="SF"></el-option>
<el-option label="中通快递" value="STO"></el-option> -->
<el-option v-for="item in $store.state.logisticsCompany" :key="item.companyId" :label="item.companyName" :value="item.companyCode"></el-option>
</el-select>
</el-form-item>
<el-form-item label="物流单号" prop="logisticCode">
......@@ -53,13 +54,10 @@ export default {
async handleConfirm() {
let valid = await this.$refs.form.validate();
if(valid) {
let logisticsCompany = {
'SF': '顺丰速递',
'STO': '中通快递'
};
const item = this.$store.state.logisticsCompany.find(item => item.companyCode == this.form.logisticsCompanyCode) || {};
this.loading = true;
await delivering({
companyName: logisticsCompany[this.form.logisticsCompanyCode],
companyName: item.companyName,
companyCode: this.form.logisticsCompanyCode,
logisticsNo: this.form.logisticCode,
deliveryId: this.data.deliveryId,
......
src/views/performance-manage/components/logistics-info-dialog.vue
......@@ -7,8 +7,9 @@
物流公司：
<span v-if="!isEditing">{{data.logisticsCompanyName}}</span>
<el-select class="w160" v-else placeholder="请选择" v-model="logisticsCompanyCode">
<el-option label="顺丰速递" value="SF"></el-option>
<el-option label="中通快递" value="STO"></el-option>
<!-- <el-option label="顺丰速递" value="SF"></el-option>
<el-option label="中通快递" value="STO"></el-option> -->
<el-option v-for="item in $store.state.logisticsCompany" :key="item.companyId" :label="item.companyName" :value="item.companyCode"></el-option>
</el-select>
</span>
<span class="ml120">
......@@ -76,13 +77,10 @@ export default {
},
methods: {
async handleConfirm() {
let logisticsCompany = {
'SF': '顺丰速递',
'STO': '中通快递'
};
const item = this.$store.state.logisticsCompany.find(item => item.companyCode == this.logisticsCompanyCode) || {};
this.loading = true;
await delivering({
companyName: logisticsCompany[this.logisticsCompanyCode],
companyName: item.companyName,
companyCode: this.logisticsCompanyCode,
logisticsNo: this.logisticsNo,
deliveryId: this.data.deliveryId,
......
src/views/performance-manage/delivery-list.vue
......@@ -10,10 +10,10 @@
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词进行搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select v-model="searchType" slot="prepend" style="width:140px;" @change="handleSearchTypeChange">
<el-option label="发货单号" value="deliveryId"></el-option>
<el-option label="商品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftCode"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
<el-option label="发货单号" value="deliveryId"></el-option>
<el-option label="收件人手机号" value="consigneePhone"></el-option>
<el-option label="会员姓名" value="memberName"></el-option>
<el-option label="会员卡号" value="memberCardNo"></el-option>
......@@ -31,7 +31,7 @@
<el-table-column label="商品" width="300">
<template slot-scope="{ row }">
<div class="goods-info">
<img class="imgs-style" :src="row.giftImgUrl" alt="" />
<img class="imgs-style" :src="row.giftImgUrl[0]" alt="" />
<div class="goods-text">
<div class="goods-text-name">
{{row.giftName}}
......@@ -251,7 +251,10 @@ export default {
};
this.loading = true;
let { result: { result, totalCount } } = await getDelivery(query).finally(() => this.loading = false);
this.list = result || [];
this.list = (result || []).map(el => {
el.giftImgUrl = typeof el.giftImgUrl == 'string' ? el.giftImgUrl.split(',') : [];
return el;
});
this.pager.totalCount = totalCount;
if(this.type === 0) this.$emit('count', totalCount);
},
......
src/views/performance-manage/record.vue
......@@ -16,12 +16,12 @@
</el-select>
<el-input class="w360 ml10" placeholder="请输入关键词搜索" v-model="searchValue" clearable @keyup.enter.native="handleSearch" @change="handleSearch">
<el-select v-model="searchType" slot="prepend" style="width:160px;" @change="handleSearchTypeChange">
<el-option label="履约单号" value="orderId"></el-option>
<el-option label="礼品名称" value="giftName"></el-option>
<el-option label="礼品编码" value="giftNo"></el-option>
<el-option label="sku编码" value="giftSkuCode"></el-option>
<el-option label="会员姓名" value="memberName"></el-option>
<el-option label="会员卡号" value="memberCardNo"></el-option>
<el-option label="履约单号" value="orderId"></el-option>
</el-select>
</el-input>
<div class="clearfix mt20" style="margin-top:20px">
......
src/views/performance-manage/refund.vue
......@@ -120,7 +120,10 @@
</el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="{ row }">
<template v-if="row.refundFlag == 0 && row.refundLogisticsNo">
<template v-if="row.refundFlag == 3 ">
<span>已关闭</span>
</template>
<template v-else-if="row.refundFlag == 0 && row.refundLogisticsNo">
<div>
<dm-delete @confirm="handleReceive(row, 1)" tips="确认同意收货？">
<el-button type="text">同意收货</el-button>
......@@ -128,7 +131,7 @@
<el-button type="text" @click="openDialog('refuseDialog', row)">拒绝收货</el-button>
</div>
</template>
<template v-if="row.refundFlag != 0 && row.refundLogisticsNo">
<template v-else-if="row.refundFlag != 0 && row.refundLogisticsNo">
<span>{{ refundStatus[row.refundFlag] }}</span>
</template>
</template>
......@@ -347,7 +350,7 @@ export default {
this.row = row;
if(dialogName == 'logisticsDialog') {
let { result } = await getLogisticsInfo({
companyCode: row.refundId/* 'YD' */,
companyCode: row.refundCompanyCode/* 'YD' */,
logisticsNo: row.refundLogisticsNo/* '4312317986451' */,
});
this.logisticsDialog.logisticsList = result.traces || [];
......
vue.config.js
......@@ -43,7 +43,7 @@ module.exports = {
'vue-router': 'VueRouter',
vuex: 'Vuex',
axios: 'axios',
// 'element-ui': 'ELEMENT',
'element-ui': 'ELEMENT',
};
if (process.env.NODE_ENV === 'production') {
config.optimization.minimizer[0].options.terserOptions.compress.warnings = false;
......@@ -54,4 +54,4 @@ module.exports = {
];
}
}
};
\ No newline at end of file
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment