Skip to content

W
welfare
Commit d2e63232 by shaojiawen
Options

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

parents 7b5ef8e6 ff3b7755
Showing with 126 additions and 79 deletions
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-688297d0.30e361a5.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-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
[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.94d3145b.css deleted 100644 → 0
.w-280[data-v-1b2ddbf4]{width:280px}
\ No newline at end of file
dist/css/chunk-2cc4ec9a.aec30b1f.css 0 → 100644
.w-480[data-v-47eb2695]{width:480px}
\ 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-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-47725810.3c690e6f.css deleted 100644 → 0
.step-text[data-v-7dbe4afe]{color:#000;font-size:14px}.dash-style[data-v-7dbe4afe]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-7dbe4afe]{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-7dbe4afe]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-7dbe4afe]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-7dbe4afe]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-7dbe4afe]{padding:0}.w-630[data-v-7dbe4afe]{width:630px}.mb56[data-v-7dbe4afe]{margin-bottom:56px}.from-content[data-v-7dbe4afe]{position:relative}.from-content .demo-ruleForm .form-section[data-v-7dbe4afe]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-7dbe4afe]{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-7dbe4afe]: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-7dbe4afe]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-7dbe4afe]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-7dbe4afe]{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-7dbe4afe]{margin-top:12px}.from-content .anchor-link[data-v-7dbe4afe]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-7dbe4afe]{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-7dbe4afe]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-7dbe4afe]:hover{color:#2f54ed}.ml20[data-v-7dbe4afe]{margin-left:20px}.mr10[data-v-7dbe4afe]{margin-right:10px}.tips-content[data-v-7dbe4afe]{position:absolute;left:-4px;top:6px}.store-tips[data-v-7dbe4afe]{width:200px;position:absolute;left:-10px}.underline[data-v-7dbe4afe]{text-decoration:underline}.pickup-upload[data-v-7dbe4afe]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7dbe4afe]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7dbe4afe]{font-size:14px}.pickup-upload .pickup-list[data-v-7dbe4afe]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7dbe4afe]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7dbe4afe]{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-6180d1f9.bd1e789e.css 0 → 100644
.w-280[data-v-83f2f180]{width:280px}.w600[data-v-501db6b6]{width:600px}
\ No newline at end of file
dist/css/chunk-78fca734.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-79acfdd1.25f4b9f6.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-b60ae704]{width:360px}.w-160[data-v-b60ae704]{width:160px}.w140[data-v-b60ae704]{width:140px}.w350[data-v-b60ae704]{width:350px}.tab-top[data-v-b60ae704]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-b60ae704],.tab-top[data-v-b60ae704]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-b60ae704]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-b60ae704]{height:60px}.table-content .img-text img[data-v-b60ae704]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-b60ae704]{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-b60ae704]{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-b60ae704]{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-b60ae704]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-b60ae704]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-b60ae704]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-b60ae704]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-b60ae704]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-b60ae704]:hover{color:#2f54ed}.undeline-dash[data-v-b60ae704]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-b60ae704]{display:inline-block;line-height:32px}.hidden-data[data-v-b60ae704]{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-7acaf2c4.eed923d5.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-0fc9b23f]{width:360px}.w-160[data-v-0fc9b23f]{width:160px}.w140[data-v-0fc9b23f]{width:140px}.w350[data-v-0fc9b23f]{width:350px}.tab-top[data-v-0fc9b23f]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0fc9b23f],.tab-top[data-v-0fc9b23f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0fc9b23f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0fc9b23f]{height:60px}.table-content .img-text img[data-v-0fc9b23f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0fc9b23f]{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-0fc9b23f]{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-0fc9b23f]{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-0fc9b23f]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0fc9b23f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0fc9b23f]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0fc9b23f]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0fc9b23f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0fc9b23f]:hover{color:#2f54ed}.undeline-dash[data-v-0fc9b23f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0fc9b23f]{display:inline-block;line-height:32px}.hidden-data[data-v-0fc9b23f]{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-842b928e.1766f7ad.css deleted 100644 → 0
.w-280[data-v-1b2ddbf4]{width:280px}.w600[data-v-7f217284]{width:600px}
\ No newline at end of file
dist/css/chunk-96e064be.d701ab59.css 0 → 100644
.w-280[data-v-83f2f180]{width:280px}
\ 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-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/js/chunk-2cc4ec9a.29d1ee03.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-34bff564.a5bee281.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.f7b52046.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.3646d58f.js → dist/js/gic-card.b454be6f.js
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/stock-list/index.vue
......@@ -71,7 +71,7 @@ export default {
loading: false,
dateTime: [ new Date() - 7 * 24 * 60 * 60 * 1000, new Date() ],
listParams: {
// welfareId: this.welfareId,
welfareId: this.welfareId,
welfareSkuId: '',
modifyType: '', // 调整类型(1:加，2:减)
startDate: '',
......
src/views/gift-manage/address-lib-form.vue
......@@ -13,15 +13,20 @@
<el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit></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">
<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/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>若不开启，则默认会员可在任意时间提货</p>
<p>若开启，表示买家可选择自提时间，商户需按约定时间备货完成</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>
......
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>
......
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
......@@ -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 {
// 固定日期
......
src/views/gift-manage/pickup-list.vue
......@@ -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
......@@ -299,6 +299,7 @@ export default {
return callback(new Error('成本只能是数字'));
}
}
callback();
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
......@@ -420,8 +421,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,
......
src/views/gift-manage/real-gift.vue
......@@ -34,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>
......@@ -45,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>
......@@ -276,7 +276,7 @@ export default {
},
methods: {
init() {
this.searchType = 1;
// this.searchType = 1;
this.getTableList();
},
getSearchList() {
......@@ -300,7 +300,7 @@ export default {
} else if (this.query.type === 0) {
this.placeholderText = '请输入福利id';
}
console.log(this.searchType);
// console.log(this.searchType);
},
// 实物礼品列表
getTableList() {
......@@ -384,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',
......@@ -423,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);
......@@ -488,7 +488,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '取消隐藏',
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -527,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
......@@ -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">
......@@ -183,6 +183,7 @@ export default {
return callback(new Error('成本只能是数字'));
}
}
callback();
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
......
src/views/gift-manage/virtual-gift.vue
......@@ -34,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>
......@@ -45,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>
......@@ -276,6 +276,7 @@ export default {
id: '',
remainedStock: '',
textarea: '',
giftName: ''
},
StockDialog: false,
integralDialog: false,
......@@ -456,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);
......@@ -475,7 +476,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '隐藏',
confirmButtonText: '批量隐藏',
})
.then(() => {
this.batchRequest(params);
......@@ -501,7 +502,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '启用',
confirmButtonText: '批量启用',
})
.then(() => {
this.batchRequest(params);
......@@ -560,7 +561,7 @@ export default {
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '确认',
confirmButtonText: '取消隐藏',
}).then(() =>{
let params = {
giftIdList: [ item.giftId ],
......@@ -598,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(() => {
......@@ -636,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() {
......
src/views/performance-manage/components/cancel-order-dialog.vue
......@@ -42,6 +42,7 @@ export default {
desc: this.reason,
}).finally(() => this.loading = false);
this.visible = false;
this.$message.success('发货单已关闭');
this.$emit('refresh');
} else {
this.$message.warning('请填写关闭原因');
......
src/views/performance-manage/components/writeoff-dialog.vue
......@@ -36,6 +36,7 @@ export default {
deliveryId: this.data.deliveryId,
}).finally(() => this.loading = false);
this.visible = false;
this.$message.success('核销成功');
this.$emit('refresh');
}
}
......
src/views/performance-manage/refund.vue
......@@ -226,6 +226,8 @@ const fields = [
{ label: '退货处理状态', value: 'refundFlag', sensKey: false },
{ label: '会员姓名', value: 'memberName', sensKey: true },
{ label: '会员手机号', value: 'memberPhone', sensKey: true },
{ label: '来源应用', value: 'appName', sensKey: false },
{ label: '来源活动', value: 'activityName', sensKey: false },
{ label: '退货物流公司', value: 'refundCompanyName', sensKey: false },
{ label: '退货物流单号', value: 'refundLogisticsNo', sensKey: false },
{ label: '退货原因', value: 'refundReason', sensKey: false },
......
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