Commit 7daeffa5 by caoyanzhi

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

parents 1d26f356 26c07046
.tab-top[data-v-fb2453b0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-fb2453b0],.tab-top[data-v-fb2453b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-fb2453b0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-fb2453b0]{height:60px}.table-content .img-text img[data-v-fb2453b0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-fb2453b0]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-fb2453b0]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-fb2453b0]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-fb2453b0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-fb2453b0]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-fb2453b0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-fb2453b0]:hover{color:#2f54ed}.undeline-dash[data-v-fb2453b0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-fb2453b0]{display:inline-block;line-height:32px}
\ No newline at end of file
.order-info[data-v-72acb715]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex}.order-info .li[data-v-72acb715]{width:33%;margin:10px 0}
\ No newline at end of file
.upload-btn[data-v-d08664b6]{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-d08664b6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-d08664b6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-d08664b6]{border:none;color:#c0c4cc;margin-left:60px}.upload-ele .el-button--small[data-v-d08664b6]{padding:0}.uploadText p[data-v-d08664b6]{line-height:26px}.tab-top[data-v-4b0bc947]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-4b0bc947],.tab-top[data-v-4b0bc947]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-4b0bc947]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-4b0bc947]{height:60px}.table-content .img-text img[data-v-4b0bc947]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-4b0bc947]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-4b0bc947]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-4b0bc947]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-4b0bc947]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-4b0bc947]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-4b0bc947]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-4b0bc947]:hover{color:#2f54ed}.undeline-dash[data-v-4b0bc947]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-4b0bc947]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
.upload-btn[data-v-5f050120]{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-5f050120]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-5f050120]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-5f050120]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-5f050120]{padding:0}.w-630[data-v-5f050120]{width:630px}.mb56[data-v-5f050120]{margin-bottom:56px}.from-content[data-v-5f050120]{position:relative}.from-content .demo-ruleForm .form-section[data-v-5f050120]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-5f050120]{color:#303133;font-size:14px;font-weight:700;margin-bottom:20px;margin-left:20px;padding-bottom:20px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section .tip-warm[data-v-5f050120]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-5f050120]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-5f050120]{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-5f050120]{margin-top:12px}.from-content .anchor-link[data-v-5f050120]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-5f050120]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.ml20[data-v-5f050120]{margin-left:20px}.mr10[data-v-5f050120]{margin-right:10px}.tips-content[data-v-5f050120]{position:absolute;left:-4px;top:8px}.store-tips[data-v-5f050120]{width:200px;position:absolute;left:-10px}.underline[data-v-5f050120]{text-decoration:underline}.table-error .el-form-item__error{display:none!important}.damolish .el-form-item__label:after{content:""}.damolish .el-tooltip__popper{width:245px}table th.star div:before{content:"*";color:red}.right-border{border-right:1px solid #ebeef5}.mopney-input span{display:none!important}.from-content .see-btn{color:#909399;margin-left:15px}.from-content .see-btn:hover{color:#2f54ed}
\ No newline at end of file
.tab-top[data-v-40c29954]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-40c29954],.tab-top[data-v-40c29954]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-40c29954]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-40c29954]{height:60px}.table-content .img-text img[data-v-40c29954]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-40c29954]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-40c29954]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-40c29954]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-40c29954]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-40c29954]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-40c29954]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-40c29954]:hover{color:#2f54ed}.undeline-dash[data-v-40c29954]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-40c29954]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
.goods-info[data-v-65109406]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-65109406]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-65109406]{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-65109406]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-65109406]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}
\ No newline at end of file
.w-630[data-v-40843b7e]{width:630px}.w-480[data-v-40843b7e]{width:480px}.w-350[data-v-40843b7e]{width:350px}.w-900[data-v-40843b7e]{width:900px}.mb56[data-v-40843b7e]{margin-bottom:56px}.from-content[data-v-40843b7e]{position:relative}.from-content .demo-ruleForm .form-section[data-v-40843b7e]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-40843b7e]{color:#303133;font-size:14px;font-weight:700;margin-bottom:20px;margin-left:20px;padding-bottom:20px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section .prefix-money[data-v-40843b7e]{color:#303133}.from-content .demo-ruleForm .form-section .add-time[data-v-40843b7e]{color:#606266;margin-left:150px}.from-content .demo-ruleForm .form-section .add-time[data-v-40843b7e]:hover{color:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-40843b7e]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-40843b7e]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list[data-v-40843b7e]{width:900px;margin-bottom:20px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item[data-v-40843b7e]{width:100%}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name[data-v-40843b7e]{padding:8px;background:#f3f6f9;position:relative}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-title[data-v-40843b7e]{color:#909399;margin-right:7px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-value-title[data-v-40843b7e]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-40843b7e]{color:#909399;font-size:14px;position:absolute;right:20px;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-40843b7e]:hover{color:#2f54ed}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content[data-v-40843b7e]{padding:15px 8px 5px 8px;display:-webkit-box;display:-ms-flexbox;display:flex}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .sku-value-title[data-v-40843b7e]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list[data-v-40843b7e]{display:inline-block;-webkit-box-flex:1;-ms-flex:1;flex:1}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item[data-v-40843b7e]{border:1px solid #e4e7ed;padding:10px 8px;border-radius:4px;display:inline-block;margin-right:7px;position:relative;margin-bottom:10px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item .el-icon-error[data-v-40843b7e]{font-size:16px;position:absolute;right:-10px;top:-5px;color:#c0c4cc;display:none;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item:hover .el-icon-error[data-v-40843b7e]{display:inline-block;color:#909399}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content[data-v-40843b7e]{padding:10px;width:900px;border:1px solid #dcdfe6;border-radius:2px}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content .batch-box[data-v-40843b7e]{padding-left:130px;font-size:0;height:40px}.from-content .demo-ruleForm .fixed-btn[data-v-40843b7e]{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-40843b7e]{margin-top:12px}.from-content .anchor-link[data-v-40843b7e]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-40843b7e]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.ml20[data-v-40843b7e]{margin-left:20px}.mr10[data-v-40843b7e]{margin-right:10px}.mr16[data-v-40843b7e]{margin-right:16px}.table-img[data-v-40843b7e]{display:inline-block;width:32px;height:32px;border-radius:4px;border:1px dashed #d9d9d9;cursor:pointer;text-align:center;vertical-align:top;position:relative}.table-img img[data-v-40843b7e]{width:30px;height:30px}.table-img[data-v-40843b7e]:hover{border:1px dashed #2f54ed}.img-modal[data-v-40843b7e]{width:32px;height:32px;position:absolute;left:-1px;top:-1px;background:rgba(0,0,0,.5);display:none;cursor:pointer;border-radius:4px}.img-modal .el-icon-delete[data-v-40843b7e]{color:#fff}.table-img:hover .img-modal[data-v-40843b7e]{display:inline-block}.tips-content[data-v-40843b7e]{position:absolute;left:-4px;top:8px}.store-tips[data-v-40843b7e]{width:200px;position:absolute;left:-10px}.table-error .el-form-item__error{display:none!important}.damolish .el-form-item__label:after{content:""}.damolish .el-tooltip__popper{width:245px}table th.star div:before{content:"*";color:red}.right-border{border-right:1px solid #ebeef5}.sku-table-content .sku-table th{line-height:17px!important}.mopney-input span{display:none!important}.from-content .see-btn{color:#909399;margin-left:15px}.from-content .see-btn:hover{color:#2f54ed}
\ No newline at end of file
.dash-style[data-v-5305571c]{border-bottom:1px dashed #2f54eb}.w-630[data-v-5305571c]{width:630px}.w-480[data-v-5305571c]{width:480px}.w-350[data-v-5305571c]{width:350px}.w-900[data-v-5305571c]{width:900px}.mb56[data-v-5305571c]{margin-bottom:56px}.from-content[data-v-5305571c]{position:relative}.from-content .demo-ruleForm .form-section[data-v-5305571c]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-5305571c]{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-5305571c]: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-5305571c]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-5305571c]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list[data-v-5305571c]{width:900px;margin-bottom:20px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item[data-v-5305571c]{width:100%}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name[data-v-5305571c]{padding:8px;background:#f3f6f9;position:relative}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-title[data-v-5305571c]{color:#909399;margin-right:7px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-value-title[data-v-5305571c]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-5305571c]{color:#909399;font-size:14px;position:absolute;right:20px;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-5305571c]:hover{color:#2f54ed}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content[data-v-5305571c]{padding:15px 8px 5px 8px;display:-webkit-box;display:-ms-flexbox;display:flex}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .sku-value-title[data-v-5305571c]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list[data-v-5305571c]{display:inline-block;-webkit-box-flex:1;-ms-flex:1;flex:1}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item[data-v-5305571c]{border:1px solid #e4e7ed;padding:10px 8px;border-radius:4px;display:inline-block;margin-right:7px;position:relative;margin-bottom:10px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item .el-icon-error[data-v-5305571c]{font-size:16px;position:absolute;right:-10px;top:-5px;color:#c0c4cc;display:none;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item:hover .el-icon-error[data-v-5305571c]{display:inline-block;color:#909399}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content[data-v-5305571c]{padding:10px;width:900px;border:1px solid #dcdfe6;border-radius:2px}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content .batch-box[data-v-5305571c]{padding-left:130px;font-size:0;height:40px}.from-content .demo-ruleForm .fixed-btn[data-v-5305571c]{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-5305571c]{margin-top:12px}.from-content .anchor-link[data-v-5305571c]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-5305571c]{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-5305571c]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-5305571c]:hover{color:#2f54ed}.ml20[data-v-5305571c]{margin-left:20px}.mr10[data-v-5305571c]{margin-right:10px}.mr16[data-v-5305571c]{margin-right:16px}.table-img[data-v-5305571c]{display:inline-block;width:32px;height:32px;border-radius:4px;border:1px dashed #d9d9d9;cursor:pointer;text-align:center;vertical-align:top;position:relative}.table-img img[data-v-5305571c]{width:30px;height:30px}.table-img[data-v-5305571c]:hover{border:1px dashed #2f54ed}.img-modal[data-v-5305571c]{width:32px;height:32px;position:absolute;left:-1px;top:-1px;background:rgba(0,0,0,.5);display:none;cursor:pointer;border-radius:4px}.img-modal .el-icon-delete[data-v-5305571c]{color:#fff}.table-img:hover .img-modal[data-v-5305571c]{display:inline-block}.tips-content[data-v-5305571c]{position:absolute;left:-4px;top:8px}.store-tips[data-v-5305571c]{width:200px;position:absolute;left:-10px}.right-border{border-right:1px solid #ebeef5}.sku-table-content .sku-table th{line-height:17px!important}
\ No newline at end of file
.upload-btn[data-v-d08664b6]{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-d08664b6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-d08664b6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-d08664b6]{border:none;color:#c0c4cc;margin-left:60px}.upload-ele .el-button--small[data-v-d08664b6]{padding:0}.uploadText p[data-v-d08664b6]{line-height:26px}.tab-top[data-v-39032a04]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-39032a04],.tab-top[data-v-39032a04]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-39032a04]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-39032a04]{height:60px}.table-content .img-text img[data-v-39032a04]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-39032a04]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-39032a04]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-39032a04]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-39032a04]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-39032a04]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-39032a04]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-39032a04]:hover{color:#2f54ed}.undeline-dash[data-v-39032a04]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-39032a04]{display:inline-block;line-height:32px}
\ No newline at end of file
.step-text[data-v-32af5faa]{color:#000;font-size:14px}.dash-style[data-v-32af5faa]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-32af5faa]{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-32af5faa]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-32af5faa]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-32af5faa]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-32af5faa]{padding:0}.w-630[data-v-32af5faa]{width:630px}.mb56[data-v-32af5faa]{margin-bottom:56px}.from-content[data-v-32af5faa]{position:relative}.from-content .demo-ruleForm .form-section[data-v-32af5faa]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-32af5faa]{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-32af5faa]: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-32af5faa]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-32af5faa]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-32af5faa]{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-32af5faa]{margin-top:12px}.from-content .anchor-link[data-v-32af5faa]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-32af5faa]{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-32af5faa]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-32af5faa]:hover{color:#2f54ed}.ml20[data-v-32af5faa]{margin-left:20px}.mr10[data-v-32af5faa]{margin-right:10px}.tips-content[data-v-32af5faa]{position:absolute;left:-4px;top:6px}.store-tips[data-v-32af5faa]{width:200px;position:absolute;left:-10px}.underline[data-v-32af5faa]{text-decoration:underline}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
.goods-info[data-v-5e22701f]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-5e22701f]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-5e22701f]{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-5e22701f]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-5e22701f]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
.performance-record[data-v-27d31a10]{padding:20px}.goods-info[data-v-27d31a10]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-27d31a10]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-27d31a10]{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-27d31a10]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-27d31a10]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-08d82f95"],{"5b67":function(e,l,t){},"62b5":function(e,l,t){"use strict";t("5b67")},de2d:function(e,l,t){"use strict";t.r(l);var n=function(){var e=this,l=e.$createElement,t=e._self._c||l;return t("div",{staticStyle:{padding:"20px"}},[e._m(0),t("el-divider"),t("p",[e._v("\n 发货单信息\n ")]),e._m(1),t("el-table",[t("el-table-column",{attrs:{label:"商品",width:"300"}}),t("el-table-column",{attrs:{label:"商品编码"}}),t("el-table-column",{attrs:{label:"成本"}}),t("el-table-column",{attrs:{label:"数量"}}),t("el-table-column",{attrs:{label:"物流公司 | 运单号"}})],1)],1)},a=[function(){var e=this,l=e.$createElement,t=e._self._c||l;return t("div",[t("div",[e._v("核销成功")]),t("div",[e._v("仓库已核销,发货单完成")])])},function(){var e=this,l=e.$createElement,t=e._self._c||l;return t("ul",{staticClass:"order-info"},[t("li",[e._v("发货单号:")]),t("li",[e._v("履约单号:")]),t("li",[e._v("会员姓名:")]),t("li",[e._v("会员卡号:")]),t("li",[e._v("配货方式:")]),t("li",[e._v("收货信息:")])])}],i={name:"DeliveryDetail"},c=i,r=(t("62b5"),t("2877")),s=Object(r["a"])(c,n,a,!1,null,"72acb715",null);l["default"]=s.exports}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-53f4695c"],{"1e4b":function(t,e,s){"use strict";s.r(e);var n=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[s("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,n){return s("div",{key:n,class:"b"+(n+1)},[s("span",{staticClass:"title"},[t._v(t._s(e.title))]),s("p",{staticClass:"desc"},[t._v(t._s(e.desc))]),s("router-link",{staticClass:"target",attrs:{to:e.target}},[s("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},c=[],i=s("f9e4"),a={name:"Index",data:function(){return{wfTypes:i["b"]}}},r=a,l=(s("d457"),s("2877")),u=Object(l["a"])(r,n,c,!1,null,"2fe4d5e4",null);e["default"]=u.exports},b46e:function(t,e,s){},d457:function(t,e,s){"use strict";s("b46e")}}]);
\ No newline at end of file
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7f6e53d4"],{"1e4b":function(t,e,s){"use strict";s.r(e);var n=function(){var t=this,e=t.$createElement,s=t._self._c||e;return s("div",[s("div",{staticClass:"enter"},t._l(t.wfTypes,(function(e,n){return s("div",{key:n,class:"b"+(n+1)},[s("span",{staticClass:"title"},[t._v(t._s(e.title))]),s("p",{staticClass:"desc"},[t._v(t._s(e.desc))]),s("router-link",{staticClass:"target",attrs:{to:e.target}},[s("i",{staticClass:"icon-right-circle iconfont-welfare4"})])],1)})),0)])},i=[],a=s("f9e4"),c={name:"Index",data:function(){return{wfTypes:a["b"]}}},r=c,l=(s("d457"),s("2877")),u=Object(l["a"])(r,n,i,!1,null,"2fe4d5e4",null);e["default"]=u.exports},b46e:function(t,e,s){},d457:function(t,e,s){"use strict";s("b46e")}}]);
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -49,7 +49,7 @@ let realGift = {
method: 'post'
}, // 批量操作
realCostUpdate: {
url: '/gift/real-cost-updat',
url: '/gift/real-cost-update',
method: 'post'
}, // 实物礼品调整成本
realStockUpdate: {
......
......@@ -6,7 +6,7 @@
<h3>基础信息</h3>
<el-form-item label="福利渠道" class="w-630">{{ enterpriseName }}</el-form-item>
<el-form-item label="礼品名称" class="w-630" prop="giftName">
<dm-input :byte-type="1" type="text" v-model="goodsForm.giftName" :maxlength="30" placeholder="请输入礼品名称"></dm-input>
<dm-input :byte-type="1" type="text" v-model="goodsForm.giftName" show-word-limit :maxlength="30" placeholder="请输入礼品名称"></dm-input>
</el-form-item>
</div>
<div class="form-section">
......@@ -134,18 +134,15 @@
</el-table-column>
</el-table>
</el-form-item>
<el-form-item prop="marketPrice">
<template slot="label">
<el-tooltip open-delay="200" class="item" effect="dark" content="提供给会员作为兑换参考的划线价格" placement="top">
<span class="undeline-dash">市场价</span>
</el-tooltip>
</template>
<!-- <dm-input-amount v-model="goodsForm.marketPrice" width="480"></dm-input-amount> -->
<el-input-number v-model="goodsForm.marketPrice" :min="0" :max="999999" :precision="2"></el-input-number>
<el-popover placement="top-start" width="380" trigger="hover">
<img src="../../assets/images/eg.png" alt />
<el-button slot="reference" type="text" style="margin-left:15px;">查看示例</el-button>
</el-popover>
<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>
<div>
<span class="tip-warm">市场价在礼品详情会以划线形式显示。</span>
<el-popover placement="top-start" width="395" trigger="hover">
<img style="width:360px" src="../../assets/images/eg2.png" alt />
<el-button slot="reference" type="text" style="margin-left:15px;">查看示例</el-button>
</el-popover>
</div>
</el-form-item>
</div>
<div class="form-section">
......@@ -179,13 +176,13 @@
<el-checkbox-group v-model="goodsForm.checkList" @change="changeStockUse" :disabled="isEdit">
<el-checkbox label="0">
<el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
<div slot="content">固定库存:通过占用的方式获得固定可用库存,不会被其他应用/活动所消耗。</div>
<div slot="content" style="width:245px">固定库存:通过占用的方式获得固定可用库存,不会被其他应用/活动所消耗。</div>
<span class="inline-block ml30 dash-style">固定库存</span>
</el-tooltip>
</el-checkbox>
<el-checkbox label="1" style="margin-left:50px">
<el-tooltip class="tips-content" effect="dark" open-delay="200" popper-class="store-tips" placement="top-start">
<div slot="content">实时库存:不占用库存,使用福利中心“可占库存”,与其他应用使用同个库存。</div>
<div slot="content" style="width:245px">实时库存:不占用库存,使用福利中心“可占库存”,与其他应用使用同个库存。</div>
<span class="inline-block ml30 dash-style">实时库存</span>
</el-tooltip>
</el-checkbox>
......@@ -207,9 +204,9 @@
</div>
<div class="form-section mb56">
<h3>权限设置</h3>
<el-form-item prop="refundFlag" label="操作人权限" required>
<el-form-item prop="operAuthType" label="操作人权限" required>
{{goodsForm.operAuthType}}
<dm-acc-group-select :etype.sync="goodsForm.operAuthType" :group-ids.sync="goodsForm.operAuthPre" @updateGroupList="updateGroupList" />
<dm-acc-group-select :etype.sync="goodsForm.operAuthType" :group-ids.sync="goodsForm.operAuthPre" @change="updateGroupList" />
</el-form-item>
</div>
<div class="fixed-btn">
......@@ -489,7 +486,7 @@ export default {
.then(res => {
if (res.code === '0000') {
let resResult = res.result;
this.goodsForm.changeDelivery = resResult.changeDelivery; // 兑换方式
// this.goodsForm.changeDelivery = resResult.changeDelivery; // 兑换方式
this.goodsForm.giftName = resResult.giftName; // 礼品名称
this.goodsForm.spuList[0].giftBarNo = resResult.giftBarNo; // 礼品条形码
this.goodsForm.spuList[0].giftNo = resResult.giftNo; // 礼品编码
......@@ -498,10 +495,10 @@ export default {
this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
// this.goodsForm.shopCodeList = resResult.shopId; // 操作人权限code
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ 1, 2 ] : (resResult.stockUseType == 1 ? [ 1 ] : [ 0 ]); // 库存消耗方式
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '2' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.deliveryType = resResult.deliveryType;
if(this.goodsForm.deliveryType == '1,2'){
this.goodsForm.deliveryList = [ 1, 2 ];
this.goodsForm.deliveryList = [ '1', '2' ];
}else{
this.goodsForm.deliveryList = [ this.goodsForm.deliveryType ];
};
......@@ -1184,7 +1181,7 @@ export default {
// this.btnLoading = true;
this.$emit('updateLoading');
let params = {
// giftId: this.giftId,
giftId: this.giftId,
giftType: 1, // 实物礼品
// shopId: '', // 门店id
giftName: this.goodsForm.giftName, // 礼品名称
......@@ -1208,8 +1205,8 @@ export default {
stockUseType: this.goodsForm.stockUseType, // 库存使用类型
};
this.btnLoading = true;
if (this.giftId) {
params.giftId = this.giftId;
if (this.isEdit) {
// params.giftId = this.giftId;
giftUpdate(params).then(res =>{
if (res.code === '0000') {
this.$router.push({ path: '/gift-manage/real-gift' });
......@@ -1410,7 +1407,13 @@ export default {
}
}
}
.from-content .see-btn {
color: #909399;
margin-left: 15px;
}
.from-content .see-btn:hover {
color: #2f54ed;
}
.ml20 {
margin-left: 20px;
}
......@@ -1468,19 +1471,19 @@ export default {
/* 规格值 */
</style>
<style>
.table-error .el-form-item__error {
/* .table-error .el-form-item__error {
display: none !important;
}
.damolish .el-form-item__label::after {
} */
/* .damolish .el-form-item__label::after {
content: "";
}
.damolish .el-tooltip__popper {
} */
/* .damolish .el-tooltip__popper {
width: 245px;
}
table th.star div::before {
} */
/* table th.star div::before {
content: '*';
color: red;
}
} */
/* .cord-list .el-select-dropdown__item {
position: relative;
}
......@@ -1507,14 +1510,14 @@ table th.star div::before {
.sku-table-content .sku-table th {
line-height: 17px !important;
}
.mopney-input span {
/* .mopney-input span {
display: none !important;
}
.from-content .see-btn {
} */
/* .from-content .see-btn {
color: #909399;
margin-left: 15px;
}
.from-content .see-btn:hover {
color: #2f54ed;
}
} */
</style>
......@@ -51,15 +51,23 @@
<span>{{ scope.row.giftName }}</span>
<i class="el-icon-edit-outline" @click="handleName(scope.row)"></i>
</p>
<p class="goods-code">礼品编码:{{ scope.row.giftNo }}</p>
<p class="goods-code">福利id:{{ scope.row.giftId }}</p>
<p class="goods-code">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<p class="goods-code">福利id:{{ scope.row.giftId }}</p>
<div>更新时间:<p class="inline-block" v-html="listTime(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question"></i>
</el-tooltip>
礼品编码:{{ scope.row.giftNo }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="updateName" label="更新时间" sortable="custom" min-width="150px">
<!-- <el-table-column prop="updateName" label="更新时间" sortable="custom" min-width="150px">
<template slot-scope="scope"><span v-html="listTime(scope.row.updateTime)"></span></template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
<template slot-scope="scope">
<p class="stock-box">
......@@ -73,7 +81,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">库存</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存:福利可以被直接使用和被应用占用的数量;<br>
已占用:福利已经被应用通过”固定库存“方式占用的数量;<br>
总库存:福利实际未产生履约单,还可以被出库的数量;<br>
......@@ -98,7 +106,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">总出库量</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存:福利可以被直接使用和被应用占用的数量;<br>
已占用:福利已经被应用通过”固定库存“方式占用的数量;<br>
总库存:福利实际未产生履约单,还可以被出库的数量;<br>
......@@ -112,8 +120,11 @@
</el-table-column>
<el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" content="隐藏后福利组件中不展示,其他应用不可增加占用数量,已占用的库存不影响使用" placement="top">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">是否隐藏</span>
<span slot="content" style="width:240px">
隐藏后福利组件中不展示,其他应用不可增加占用数量,已占用的库存不影响使用
</span>
</el-tooltip>
</template>
<template slot-scope="scope">
......@@ -289,12 +300,16 @@ export default {
}
if (value.prop === 'updateTime') {
this.query.sortColumn = 'update_time';
} else if (value.prop === 'costPrice') {
this.query.sortColumn = 'cost_price';
} else if (value.prop === 'costPrice' && value.order == 'ascending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'costPrice' && value.order == 'descending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'stock') {
this.query.sortColumn = 'stock';
this.query.sortColumn = 'remained_stock';
}
this.getTableList();
// min_cost_price asc 成本价
// max_cost_price desc
},
changeTime(){
if(this.timeValue){
......@@ -463,10 +478,11 @@ export default {
// this.updateCostData.costPrice = item.costPrice;
// this.updateCostData.textarea = item.textarea;
this.updateCostDialog = true;
console.log(this.updateCostDialog);
},
closeUpdateCost() {
this.integralDate.id = '';
this.integralDate.costPrice = '';
// this.integralDate.id = '';
// this.integralDate.costPrice = '';
this.updateCostDialog = false;
},
add() {
......@@ -525,7 +541,7 @@ export default {
color: #606266;
line-height: 18px;
font-size: 14px;
margin-bottom: 10px;
margin-bottom: 25px;
}
.goods-code {
color: #909399;
......@@ -561,7 +577,7 @@ export default {
}
</style>
<style>
.damolish .el-tooltip__popper{
/* .damolish .el-tooltip__popper{
width: 240px;
}
} */
</style>
\ No newline at end of file
......@@ -52,16 +52,24 @@
<span>{{ scope.row.giftName }}</span>
<i class="el-icon-edit-outline" @click="handleName(scope.row)"></i>
</p>
<p class="goods-code">礼品编码:{{ scope.row.giftNo }}</p>
<p class="goods-code">福利id:{{ scope.row.giftId }}</p>
<p class="goods-code">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<p class="goods-code">福利id:{{ scope.row.giftId }}</p>
<div>更新时间:<p class="inline-block" v-html="listTime(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question"></i>
</el-tooltip>
礼品编码:{{ scope.row.giftNo }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="updateTime" label="更新时间" sortable="custom" min-width="150px">
<!-- <el-table-column prop="updateTime" label="更新时间" sortable="custom" min-width="150px"> -->
<!-- <template slot-scope="scope">{{ formatDateTimeByType(scope.row.updateName) }}</template> -->
<template slot-scope="scope"><span v-html="listTime(scope.row.updateTime)"></span></template>
</el-table-column>
<!-- <template slot-scope="scope"><span v-html="listTime(scope.row.updateTime)"></span></template> -->
<!-- </el-table-column> -->
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
<template slot-scope="scope">
<p class="stock-box">
......@@ -75,7 +83,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">库存</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存:福利可以被直接使用和被应用占用的数量;<br>
已占用:福利已经被应用通过”固定库存“方式占用的数量;<br>
总库存:福利实际未产生履约单,还可以被出库的数量;<br>
......@@ -100,7 +108,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">总出库量</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存:福利可以被直接使用和被应用占用的数量;<br>
已占用:福利已经被应用通过”固定库存“方式占用的数量;<br>
总库存:福利实际未产生履约单,还可以被出库的数量;<br>
......@@ -114,8 +122,11 @@
</el-table-column>
<el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" content="隐藏后福利组件中不展示,其他应用不可增加占用数量,已占用的库存不影响使用" placement="top">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">是否隐藏</span>
<span slot="content" style="width:240px">
隐藏后福利组件中不展示,其他应用不可增加占用数量,已占用的库存不影响使用
</span>
</el-tooltip>
</template>
<template slot-scope="scope">
......@@ -640,7 +651,7 @@ export default {
color: #606266;
line-height: 18px;
font-size: 14px;
margin-bottom: 10px;
margin-bottom: 25px;
}
.goods-code {
color: #909399;
......@@ -676,7 +687,7 @@ export default {
}
</style>
<style>
.damolish .el-tooltip__popper{
/* .damolish .el-tooltip__popper{
width: 240px;
}
} */
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment