Skip to content

W
welfare
Commit 97e9e37b by 萱草
Options

update: 过滤bug修改

parent ef06e982
Showing with 71 additions and 102 deletions
dist/css/chunk-05c2d03e.299ff7bf.css deleted 100644 → 0
.order-info[data-v-06d082c3]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-06d082c3]{width:33%;margin:10px 0}.delivery-complete[data-v-06d082c3]{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-06d082c3]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-06d082c3]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-06d082c3]{margin-top:16px;color:#606266}.delivery-complete p[data-v-06d082c3]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-06d082c3]{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-06d082c3]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-06d082c3]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-06d082c3]{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-06d082c3]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-06d082c3]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-06d082c3]{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-06d082c3]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-06d082c3]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-06d082c3]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file
dist/css/chunk-1a5794e5.f846e45d.css 0 → 100644
.step-text[data-v-12f6f60a]{color:#000;font-size:14px}.dash-style[data-v-12f6f60a]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-12f6f60a]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-12f6f60a]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-12f6f60a]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-12f6f60a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-12f6f60a]{padding:0}.w-630[data-v-12f6f60a]{width:630px}.mb56[data-v-12f6f60a]{margin-bottom:56px}.from-content[data-v-12f6f60a]{position:relative}.from-content .demo-ruleForm .form-section[data-v-12f6f60a]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-12f6f60a]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-12f6f60a]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-12f6f60a]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-12f6f60a]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-12f6f60a]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-12f6f60a]{margin-top:12px}.from-content .anchor-link[data-v-12f6f60a]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-12f6f60a]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-12f6f60a]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-12f6f60a]:hover{color:#2f54ed}.ml20[data-v-12f6f60a]{margin-left:20px}.mr10[data-v-12f6f60a]{margin-right:10px}.tips-content[data-v-12f6f60a]{position:absolute;left:-4px;top:6px}.store-tips[data-v-12f6f60a]{width:200px;position:absolute;left:-10px}.underline[data-v-12f6f60a]{text-decoration:underline}.pickup-upload[data-v-12f6f60a]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-12f6f60a]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-12f6f60a]{font-size:14px}.pickup-upload .pickup-list[data-v-12f6f60a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-12f6f60a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-12f6f60a]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-1ed5f666.f0bd96d3.css 0 → 100644
[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-b7f9a690]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-b7f9a690]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-b7f9a690]{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-b7f9a690]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-b7f9a690]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
dist/css/chunk-2503fb08.7a5b166e.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-69dea756]{width:360px}.w-160[data-v-69dea756]{width:160px}.w140[data-v-69dea756]{width:140px}.w350[data-v-69dea756]{width:350px}.tab-top[data-v-69dea756]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-69dea756],.tab-top[data-v-69dea756]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-69dea756]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-69dea756]{height:60px}.table-content .img-text img[data-v-69dea756]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-69dea756]{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-69dea756]{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-69dea756]{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-69dea756]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-69dea756]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-69dea756]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-69dea756]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-69dea756]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-69dea756]:hover{color:#2f54ed}.undeline-dash[data-v-69dea756]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-69dea756]{display:inline-block;line-height:32px}.hidden-data[data-v-69dea756]{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-32bc2e76.fa2436f1.css 0 → 100644
.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-0cdabcb1]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-0cdabcb1]{width:33%;margin:10px 0}.delivery-complete[data-v-0cdabcb1]{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-0cdabcb1]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-0cdabcb1]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-0cdabcb1]{margin-top:16px;color:#606266}.delivery-complete p[data-v-0cdabcb1]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-0cdabcb1]{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-0cdabcb1]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-0cdabcb1]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-0cdabcb1]{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-0cdabcb1]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-0cdabcb1]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-0cdabcb1]{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-0cdabcb1]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-0cdabcb1]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-0cdabcb1]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file
dist/css/chunk-3339acd5.0f29488e.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-2eb9b096]{width:360px}.w-160[data-v-2eb9b096]{width:160px}.w140[data-v-2eb9b096]{width:140px}.w350[data-v-2eb9b096]{width:350px}.tab-top[data-v-2eb9b096]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-2eb9b096],.tab-top[data-v-2eb9b096]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-2eb9b096]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-2eb9b096]{height:60px}.table-content .img-text img[data-v-2eb9b096]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-2eb9b096]{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-2eb9b096]{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-2eb9b096]{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-2eb9b096]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-2eb9b096]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-2eb9b096]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-2eb9b096]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-2eb9b096]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-2eb9b096]:hover{color:#2f54ed}.undeline-dash[data-v-2eb9b096]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-2eb9b096]{display:inline-block;line-height:32px}.hidden-data[data-v-2eb9b096]{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-3a7bafff.65b1a072.css deleted 100644 → 0
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-0d1697c0]{width:360px}.w-160[data-v-0d1697c0]{width:160px}.w140[data-v-0d1697c0]{width:140px}.w350[data-v-0d1697c0]{width:350px}.tab-top[data-v-0d1697c0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0d1697c0],.tab-top[data-v-0d1697c0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0d1697c0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0d1697c0]{height:60px}.table-content .img-text img[data-v-0d1697c0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0d1697c0]{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-0d1697c0]{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-0d1697c0]{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-0d1697c0]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0d1697c0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0d1697c0]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0d1697c0]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0d1697c0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0d1697c0]:hover{color:#2f54ed}.undeline-dash[data-v-0d1697c0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0d1697c0]{display:inline-block;line-height:32px}.hidden-data[data-v-0d1697c0]{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-6920952e.9e39dba6.css deleted 100644 → 0
.logistics-info[data-v-7b704b71]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-7b704b71]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-7b704b71]{display:inline-block}.logistics-info span+span[data-v-7b704b71]{margin-left:10px}.logistics-step[data-v-7b704b71]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-7b704b71]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-7b704b71]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-7b704b71]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-7b704b71]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-7b704b71]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-7b704b71]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-74ddfb41.427b36c1.css 0 → 100644
.empty_block[data-v-5c83d712]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-5c83d712]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-5c83d712]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-5c83d712]{display:inline-block}.logistics-info span+span[data-v-5c83d712]{margin-left:10px}.logistics-step[data-v-5c83d712]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-5c83d712]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-5c83d712]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-5c83d712]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-5c83d712]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-5c83d712]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-5c83d712]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-b8b55010.f315b81b.css deleted 100644 → 0
[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-77230a36]{color:#faad14;font-size:21px}.logistics-info[data-v-4f0cd98a]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-4f0cd98a]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-4f0cd98a]{display:inline-block}.logistics-info span+span[data-v-4f0cd98a]{margin-left:10px}.logistics-step[data-v-4f0cd98a]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-4f0cd98a]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-4f0cd98a]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-4f0cd98a]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-4f0cd98a]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-4f0cd98a]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-4f0cd98a]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-73b5382e]{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-73b5382e]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-7e9e03b8]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-7e9e03b8]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-7e9e03b8]{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-7e9e03b8]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-7e9e03b8]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
dist/css/chunk-db2a00e6.dabf5f20.css deleted 100644 → 0
.step-text[data-v-65af295c]{color:#000;font-size:14px}.dash-style[data-v-65af295c]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-65af295c]{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-65af295c]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-65af295c]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-65af295c]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-65af295c]{padding:0}.w-630[data-v-65af295c]{width:630px}.mb56[data-v-65af295c]{margin-bottom:56px}.from-content[data-v-65af295c]{position:relative}.from-content .demo-ruleForm .form-section[data-v-65af295c]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-65af295c]{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-65af295c]: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-65af295c]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-65af295c]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-65af295c]{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-65af295c]{margin-top:12px}.from-content .anchor-link[data-v-65af295c]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-65af295c]{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-65af295c]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-65af295c]:hover{color:#2f54ed}.ml20[data-v-65af295c]{margin-left:20px}.mr10[data-v-65af295c]{margin-right:10px}.tips-content[data-v-65af295c]{position:absolute;left:-4px;top:6px}.store-tips[data-v-65af295c]{width:200px;position:absolute;left:-10px}.underline[data-v-65af295c]{text-decoration:underline}.pickup-upload[data-v-65af295c]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-65af295c]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-65af295c]{font-size:14px}.pickup-upload .pickup-list[data-v-65af295c]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-65af295c]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-65af295c]{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-f2802392.b3408b2b.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-34351082]{width:360px}.w-160[data-v-34351082]{width:160px}.w140[data-v-34351082]{width:140px}.w350[data-v-34351082]{width:350px}.tab-top[data-v-34351082]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-34351082],.tab-top[data-v-34351082]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-34351082]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-34351082]{height:60px}.table-content .img-text img[data-v-34351082]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-34351082]{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-34351082]{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-34351082]{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-34351082]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-34351082]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-34351082]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-34351082]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-34351082]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-34351082]:hover{color:#2f54ed}.undeline-dash[data-v-34351082]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-34351082]{display:inline-block;line-height:32px}.hidden-data[data-v-34351082]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/js/chunk-05c2d03e.e0046d59.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-05c2d03e"],{"1ba7":function(e,t,r){"use strict";r("d06d")},2072:function(e,t,r){"use strict";r("8e6e"),r("ac6a"),r("456d");var i=r("ade3"),s=r("71f6"),l=r("f121");function a(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(e);t&&(i=i.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,i)}return r}function o(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?a(Object(r),!0).forEach((function(t){Object(i["a"])(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):a(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}var d={getDelivery:{url:"/delivery-order/get-page-list",method:"post"},getPerformanceList:{url:"/order/get-page-list",method:"post"},getApplicationList:"/stock/application-list",getRefund:{url:"/refund-order/get-page-list",method:"post"},exportRefundData:{url:"/refund-order/order-export",method:"post"},exportDeliveryData:{url:"/delivery-order/order-export",method:"post"},exportPerformanceData:{url:"/order/order-export",method:"post"},getLogisticsInfo:{url:"/logistics/get-logistics-info",method:"post"},handleRefundOrder:{url:"/refund-order/process-refund-order",method:"post"},getDeliveryDetail:{url:"/delivery-order/get-delivery-detail",method:"post",useFormData:!0},delivering:{url:"/delivery-order/delivering",method:"post"},closeOrder:{url:"/delivery-order/close",method:"post",useFormData:!0}};d=Object(s["a"])(d,l["f"]),t["a"]=o({},d)},d06d:function(e,t,r){},de2d:function(e,t,r){"use strict";r.r(t);var i=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],staticClass:"p20"},[2===e.deliveryInfo.deliveryType&&0===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-todo"},[r("div",{staticClass:"status"},[r("i",[e._v("1")]),r("span",[e._v("创建发货单")]),r("div",{staticClass:"line"}),r("i",[e._v("2")]),r("span",[e._v("门店核销")]),r("div",{staticClass:"time"},[e._v(e._s(e._f("formatDate")(e.deliveryInfo.deliveryTime)))])]),r("div",{staticClass:"status-text"},[e._v("等待核销")]),r("div",{staticClass:"status-description"},[e._v("发货单创建成功")]),r("div",[r("el-button",{staticClass:"specter",attrs:{type:"primary"}},[e._v("发货核销")]),r("el-button",[e._v("关闭发货单")])],1)]):e._e(),1===e.deliveryInfo.deliveryType&&0===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-todo"},[r("div",{staticClass:"status"},[r("i",[e._v("1")]),r("span",[e._v("创建发货单")]),r("div",{staticClass:"line"}),r("i",[e._v("2")]),r("span",[e._v("仓库发货")]),r("div",{staticClass:"time"},[e._v(e._s(e._f("formatDate")(e.deliveryInfo.deliveryTime)))])]),r("div",{staticClass:"status-text"},[e._v("等待仓库发货")]),r("div",{staticClass:"status-description"},[e._v("发货单创建成功")]),r("div",[r("el-button",{staticClass:"specter",attrs:{type:"primary"}},[e._v("发货核销")]),r("el-button",[e._v("关闭发货单")])],1)]):2===e.deliveryInfo.deliveryType&&1===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-success"}),r("p",[e._v("核销成功")]),r("p",[e._v("仓库已核销，发货单完成")])]):1===e.deliveryInfo.deliveryType&&1===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-success"}),r("p",[e._v("已发货")]),r("p",[e._v("仓库已发货，发货单完成")])]):2===e.deliveryInfo.deliveryFlag?r("div",{staticClass:"delivery-complete"},[r("i",{staticClass:"el-icon-error"}),r("p",[e._v("发货单关闭")]),r("p",[e._v("仓库关闭发货单")]),r("p",[e._v(e._s(e.deliveryInfo.cancelReason))])]):e._e(),r("el-divider"),r("p",[e._v("\n 发货单信息\n ")]),1==e.deliveryInfo.deliveryFlag?r("ul",{staticClass:"order-info"},[r("li",[e._v("发货单号："+e._s(e.deliveryInfo.deliveryId))]),r("li",[e._v("履约单号："+e._s(e.deliveryInfo.orderId))]),r("li",[e._v("会员姓名："+e._s(e.deliveryInfo.memberName))]),r("li",[e._v("会员卡号："+e._s(e.deliveryInfo.memberCardNo))]),r("li",[e._v("配货方式：物流发货")]),r("li",[e._v("收货信息："+e._s(e.deliveryInfo.consignee)+" "+e._s(e.deliveryInfo.consigneePhone)+" "+e._s(e.deliveryInfo.consigneeAddress))])]):r("ul",{staticClass:"order-info"},[r("li",[e._v("发货单号："+e._s(e.deliveryInfo.deliveryId))]),r("li",[e._v("履约单号："+e._s(e.deliveryInfo.orderId))]),r("li",[e._v("会员姓名："+e._s(e.deliveryInfo.memberName))]),r("li",[e._v("会员卡号："+e._s(e.deliveryInfo.memberCardNo))]),r("li",[e._v("配货方式：上门自提")]),r("li",[e._v("提货信息："+e._s(e.deliveryInfo.consignee)+" "+e._s(e.deliveryInfo.consigneePhone))]),r("li",[e._v("自提点："+e._s(e.deliveryInfo.pickUpPointAddress))]),r("li",[e._v("提货地址："+e._s(e.deliveryInfo.pickUpPointName))]),r("li",[e._v("提货时间："+e._s(e._f("formatDate")(e.deliveryInfo.pickUpStartTime))+" - "+e._s(e._f("formatDate")(e.deliveryInfo.pickUpStopTime)))])]),r("el-table",{attrs:{data:e.giftList}},[r("el-table-column",{attrs:{label:"礼品",width:"300"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[r("div",{staticClass:"goods-info"},[r("img",{staticClass:"imgs-style",attrs:{src:i.giftImgUrl,alt:""}}),r("div",{staticClass:"goods-text"},[r("div",{staticClass:"goods-text-name"},[e._v("\n "+e._s(i.giftName)+"\n ")]),r("div",{staticClass:"goods-text-info"},[r("div",e._l(JSON.parse(i.giftSkuStrand),(function(t,i){return r("span",{key:i},[e._v(e._s(t.specStandardName)+"："+e._s(t.specStandardValueName)+"   ")])})),0),r("div",[e._v("SKU编码："+e._s(i.giftSkuCode))])])])])]}}])}),r("el-table-column",{attrs:{label:"礼品编码",prop:"giftId"}}),r("el-table-column",{attrs:{label:"成本（元）",prop:"costPrice"}}),r("el-table-column",{attrs:{label:"数量",prop:"exchangeQuantity"}}),r("el-table-column",{attrs:{label:"物流公司 | 运单号"},scopedSlots:e._u([{key:"default",fn:function(t){var i=t.row;return[r("p",[e._v(e._s(i.logisticsCompanyName||"--"))]),r("p",[e._v(e._s(i.logisticsNo||"--"))])]}}])})],1)],1)},s=[],l=(r("96cf"),r("1da1")),a=r("2072"),o=a["a"].getDeliveryDetail,d={name:"DeliveryDetail",data:function(){return{giftList:[],deliveryInfo:{},loading:!1}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"履约管理"},{breadName:"发货单",breadPath:"/performance/delivery"},{breadName:"发货单详情"}]),this.getDeliveryDetail()},methods:{getDeliveryDetail:function(){var e=Object(l["a"])(regeneratorRuntime.mark((function e(){var t,r,i=this;return regeneratorRuntime.wrap((function(e){while(1)switch(e.prev=e.next){case 0:return this.loading=!0,e.next=3,o({deliveryId:this.$route.query.deliveryId}).finally((function(){return i.loading=!1}));case 3:t=e.sent,r=t.result,this.deliveryInfo=r.orderDelivery,this.giftList=[r.orderDelivery];case 6:case"end":return e.stop()}}),e,this)})));function t(){return e.apply(this,arguments)}return t}()}},n=d,v=(r("1ba7"),r("2877")),c=Object(v["a"])(n,i,s,!1,null,"06d082c3",null);t["default"]=c.exports}}]);
\ No newline at end of file
src/views/gift-manage/real-gift-detail.vue
......@@ -184,7 +184,7 @@
<dm-input-amount v-model="goodsForm.costPrice" width="180" :min="0" :max="999999.99" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-amount>
</el-form-item>
<el-form-item label="可占用库存" class="w-630" prop="stock">
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" :disabled="goodsStandardInfo.length > 0" placeholder="上传文件后自动填充"></dm-input-number>
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-number>
</el-form-item>
<el-form-item prop="marketPrice" label="市场价:">
<dm-input-amount v-model="goodsForm.marketPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
......@@ -290,21 +290,21 @@ export default {
selectPickupStore,
},
data() {
let marketPriceValidator = (rule, value, callback) => {
let reg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/;
if (value) {
if (!reg.test(Number(value))) {
return callback(new Error('市场价必须为正数'));
} else {
if(Number(value) > 9999999){
return callback(new Error('市场价最大为7位数'));
}
callback();
}
} else {
callback();
}
};
// let marketPriceValidator = (rule, value, callback) => {
// let reg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/;
// if (value) {
// if (!reg.test(Number(value))) {
// return callback(new Error('市场价必须为正数'));
// } else {
// if(Number(value) > 9999999){
// return callback(new Error('市场价最大为7位数'));
// }
// callback();
// }
// } else {
// callback();
// }
// };
let validateTime = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入时间'));
......@@ -410,7 +410,8 @@ export default {
},
goodsRules: {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
marketPrice: [ { validator: marketPriceValidator, trigger: 'blur' } ],
costPrice: [ { required: true, message: '请输入成本', trigger: 'blur' } ],
stock: [ { required: true, message: '请输入可占用库存', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
deliveryList: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
......@@ -1769,39 +1770,10 @@ export default {
.add-sku-button .el-button--text{
color: #303133;
}
/* .table-error .el-form-item__error {
display: none !important;
} */
/* .damolish .el-form-item__label::after {
content: "";
} */
/* .damolish .el-tooltip__popper {
width: 245px;
} */
.sku-table th.star div::before {
content: '*';
color: red;
}
/* .cord-list .el-select-dropdown__item {
position: relative;
}
.cord-list .delete-icon {
position: absolute;
right: 10px;
top: 9px;
display: none;
color: #909399;
}
.cord-list .delete-icon .el-icon-error {
color: #c0c4c0;
}
.cord-list .delete-icon:hover .el-icon-error {
color: #909399;
}
.cord-list .el-select-dropdown__item:hover .delete-icon {
display: inline-block;
} */
.right-border {
border-right: 1px solid #ebeef5;
}
......@@ -1811,14 +1783,4 @@ export default {
.hidden-limit .dm-input__counter{
display: none;
}
/* .mopney-input span {
display: none !important;
} */
/* .from-content .see-btn {
color: #909399;
margin-left: 15px;
}
.from-content .see-btn:hover {
color: #2f54ed;
} */
</style>
src/views/gift-manage/real-gift.vue
......@@ -62,7 +62,7 @@
<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>
<div class="text">
<p class="goods-descript">
<el-tooltip class="item" effect="dark" :content="scope.row.giftName" placement="top">
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="hover" @show="getName(scope.row.giftName)">
......@@ -289,17 +289,30 @@ export default {
},
methods: {
init() {
this.searchType = 1;
this.getTableList();
},
getSearchList() {
if (this.searchType === 1) {
this.query.giftName = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftId = '';
} else if (this.searchType === 2) {
this.query.giftNo = this.search;
this.query.giftBarNo = '';
this.query.giftId = '';
this.query.giftName = '';
} else if (this.searchType === 3) {
this.query.giftBarNo = this.search;
this.query.giftNo = '';
this.query.giftName = '';
this.query.giftId = '';
} else if (this.searchType === 4) {
this.query.giftId = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftName = '';
}
this.query.pageNum = 1;
this.getTableList();
......@@ -315,6 +328,7 @@ export default {
} else if (this.searchType === 4) {
this.placeholderText = '福利id';
}
console.log(this.searchType);
},
// 实物礼品列表
getTableList() {
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -22,7 +22,7 @@
</div>
<div class="form-section">
<h3>库存信息</h3>
<el-form-item label="成本" class="w-630" prop="costPrice">
<el-form-item label="成本" class="w-630" prop="virCostPrice">
<dm-input-amount v-model="goodsForm.virCostPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
</el-form-item>
<el-form-item label="库存" class="w-630" prop="stock">
......@@ -48,7 +48,7 @@
<div class="form-section">
<h3>福利设置</h3>
<!-- 虚拟 -->
<el-form-item label="发货内容" required>
<el-form-item label="发货内容" required prop="template">
<template>
<div style="display:flex;">
<dm-editor width="500" height="300" :value="goodsForm.template" :placeholder="template" @change="handleChange2" :readonly="readonly"></dm-editor>
......@@ -59,31 +59,16 @@
<el-step>
<div slot="description" style="width:360px">
<span class="step-text">编辑发货内容，变量请使用大括号标记"{}"。</span>
<el-button type="text" @click="saveDescription">点击生成模板</el-button></div>
<!-- <el-button type="text" @click="saveDescription">点击生成模板</el-button></div> -->
</div>
</el-step>
<el-step>
<div slot="description">
<span class="step-text">下载当前内容生成的模板。</span>
<el-button type="text" @click="downloadFile">点击下载模板</el-button></div>
<span class="step-text">下载模板并以“变量”为表头填入变量值。</span>
<el-button type="text" @click="downloadFile">点击下载</el-button></div>
</el-step>
<el-step>
<div slot="description">
<!-- <div>
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<el-upload class="upload-ele inline-block" :action="uploadAction" :show-file-list="false" :on-change="beforeUploadFile" with-credentials>
<el-button class="block" @click="templateUpload"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button>
<span class="block">{{fileName}}</span>
</el-upload>
<el-popover placement="top" trigger="hover">
<div style="font-size:6px">
1.填充空缺内容，导出所有项均为必填项;<br>
2.请勿导入重复的内容，导入的内容在原来基础上增加库存;<br>
3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;
</div>
<el-button slot="reference" type="text">查看导入规则</el-button>
</el-popover>
</div>
<el-button type="text" class="block" @click="checkUploadDetail">查看内容</el-button> -->
<div class="pickup-upload">
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<dm-upload-file
......@@ -102,7 +87,7 @@
<el-popover trigger="click" placement="right" popper-class="upload-popper">
<el-button slot="reference" type="text">查看导入规则</el-button>
<div class="upload-tip-text">
<p>1.填充空缺内容，导出所有项均为必填项;</p>
<p>1.请按照顺序维护表头，所有变量均为必填项;</p>
<p>2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
</div>
......@@ -111,12 +96,6 @@
</span>
<div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
</dm-upload-file>
<!-- <div class="pickup-list" v-if="uploadFile.name">
<p class="pickup-list-name">
<i class="iconfont-welfare4 icon-wenjian1 file-icon"></i>
{{ uploadFile.name }}
</p>
</div> -->
</div>
</div>
</el-step>
......@@ -234,11 +213,12 @@ export default {
template: '示例1:<br>卡号：{01}<br>卡密：{02}<br><br>示例2：<br>点击卡密链接，使用星巴克电子券二维码直接在门店核销。<br>{卡密链接}<br> 使用条款：<br>本电子代金券需一次性使用完毕，不可兑换现金，不找零，不与其他优惠同享。<br>您可凭以上所示二维码在有效期内前往中国大陆地区星巴克门店购买商品',
goodsRules: {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
// marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
virCostPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
// deliveryType: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ]
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
template: [ { required: true, message: '请输入发货内容', trigger: 'blur' } ]
},
giftId: '',
editorWidth: 900,
......@@ -328,6 +308,9 @@ export default {
// });
},
downloadFile() {
if(!this.isEdit){
this.saveDescription();
}
const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
},
......
src/views/gift-manage/virtual-gift.vue
......@@ -61,7 +61,7 @@
<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>
<div class="text">
<p class="goods-descript">
<el-tooltip class="item" effect="dark" :content="scope.row.giftName" placement="top">
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="click" @show="getName(scope.row.giftName)">
......@@ -321,12 +321,24 @@ export default {
getSearchList() {
if (this.searchType === 1) {
this.query.giftName = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftId = '';
} else if (this.searchType === 2) {
this.query.giftNo = this.search;
this.query.giftBarNo = '';
this.query.giftId = '';
this.query.giftName = '';
} else if (this.searchType === 3) {
this.query.giftBarNo = this.search;
this.query.giftNo = '';
this.query.giftName = '';
this.query.giftId = '';
} else if (this.searchType === 4) {
this.query.giftId = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftName = '';
}
this.pageNum = 1;
this.getTableList();
......
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