Skip to content

W
welfare
Commit 5a27af04 by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/css/chunk-0ed85f5a.859d99ef.css
#	dist/css/chunk-30fdcc87.eeee47a9.css
#	dist/css/chunk-3cc0c584.ab7f0b6f.css
#	dist/css/chunk-5113f89e.5af45a64.css
#	dist/css/chunk-5113f89e.c8051181.css
#	dist/css/chunk-fa650fdc.947036af.css
#	dist/css/gic-card.96aadff2.css
#	dist/index.html
#	dist/js/app.7314935a.js
#	dist/js/app.d44fbb11.js
#	dist/js/app.ffeed4d3.js
#	dist/js/card-package~gic-card.e4df0a6b.js
#	dist/js/chunk-30fdcc87.6067a52e.js
#	dist/js/chunk-3cc0c584.7ab7b489.js
#	dist/js/chunk-5113f89e.e956768f.js
#	dist/js/chunk-fa650fdc.129bcbb9.js
#	src/components/stock-list/dialog.vue
#	src/components/stock-upload-record/index.vue
parents fbe8c888 37408f8b
Showing with 157 additions and 96 deletions
dist/css/card-package~gic-card.9d60c487.css deleted 100644 → 0
.prepend-select[data-v-9a364078] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-9a364078] .el-input__inner{border-radius:0 2px 2px 0}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:-4px;left:0;width:60px;height:60px;border-radius:4px}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
dist/css/card-package~gic-card.be9d6c78.css 0 → 100644
.prepend-select[data-v-9a364078] .el-input__inner{-webkit-box-shadow:none!important;box-shadow:none!important;border-color:#dcdfe6!important;border-right:none!important;border-radius:2px 0 0 2px}.insert-input[data-v-9a364078] .el-input__inner{border-radius:0 2px 2px 0}.statistics .el-table__empty-block .el-table__empty-text:before{display:none}.welfare-item{width:100%;background:#fff}.welfare-item .head{border-bottom:1px solid #e4e7ed;font-size:13px;background:#f7f8fa;color:#303133;height:40px;line-height:40px;padding:0 20px 0;color:#606266}.welfare-item .head span{margin-right:30px}.welfare-item .head span.btn{margin-right:5px;font-weight:400;color:#303133;line-height:40px;float:right;cursor:pointer}.welfare-item .content{height:83px;overflow:hidden;padding:0;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:10px 16px;border-bottom:1px solid #e4e7ed;margin-bottom:20px}.welfare-item .content,.welfare-item .content .f1{display:-webkit-box;display:-ms-flexbox;display:flex}.welfare-item .content .f1{-webkit-box-flex:6;-ms-flex:6;flex:6;border-right:1px solid #e4e7ed}.welfare-item .content .f1>*{-webkit-box-flex:1;-ms-flex:1;flex:1}.welfare-item .content .f1>p{margin-left:10px;padding-top:4px;font-size:14px;font-weight:400;color:#606266;line-height:20px}.welfare-item .content .f1>p span{margin-top:6px;display:block;font-size:18px;font-weight:500;line-height:21px;color:#303133}.welfare-item .content .f1 div.detail{-webkit-box-flex:2;-ms-flex:2;flex:2;position:relative;padding-left:70px}.welfare-item .content .f1 div.detail img{position:absolute;top:-4px;left:0;width:60px;height:60px;border-radius:0}.welfare-item .content .f1 div.detail p:first-child{padding-top:8px;font-weight:400;color:#303133;line-height:22px;margin-bottom:6px}.welfare-item .content .f1 div.detail p:first-child+p{font-size:12px;color:#303133;line-height:17px}.welfare-item .content .f2{-webkit-box-flex:4;-ms-flex:4;flex:4;padding:0 20px 0}.welfare-item .content .f2 /deep/ .el-col{color:#606266;line-height:20px}.welfare-item .content .f2 /deep/ .el-col span{color:#303133}
\ No newline at end of file
dist/css/chunk-039a83d7.bf3cbf9a.css deleted 100644 → 0
.w260[data-v-1b733ba8]{width:260px}
\ No newline at end of file
dist/css/chunk-113836a9.6907d90c.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-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-30fdcc87.eeee47a9.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-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-458d8bf0]{width:360px}.w-160[data-v-458d8bf0]{width:160px}.w140[data-v-458d8bf0]{width:140px}.w350[data-v-458d8bf0]{width:350px}.mr4[data-v-458d8bf0]{margin-right:4px}.tab-top[data-v-458d8bf0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-458d8bf0],.tab-top[data-v-458d8bf0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-458d8bf0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-458d8bf0]{height:60px}.table-content .img-text img[data-v-458d8bf0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-458d8bf0]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-458d8bf0]{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-458d8bf0]{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-458d8bf0]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-458d8bf0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-458d8bf0]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-458d8bf0]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-458d8bf0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-458d8bf0]:hover{color:#2f54ed}.undeline-dash[data-v-458d8bf0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-458d8bf0]{display:inline-block;line-height:32px}.hidden-data[data-v-458d8bf0]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-372edb4c.3c00b833.css 0 → 100644
.step-text[data-v-52b17280]{color:#000;font-size:14px}.dash-style[data-v-52b17280]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-52b17280]{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-52b17280]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-52b17280]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-52b17280]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-52b17280]{padding:0}.w-630[data-v-52b17280]{width:630px}.mb56[data-v-52b17280]{margin-bottom:56px}.from-content[data-v-52b17280]{position:relative}.from-content .demo-ruleForm .form-section[data-v-52b17280]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-52b17280]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-52b17280]: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-52b17280]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-52b17280]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-52b17280]{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-52b17280]{margin-top:12px}.from-content .anchor-link[data-v-52b17280]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-52b17280]{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-52b17280]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-52b17280]:hover{color:#2f54ed}.ml20[data-v-52b17280]{margin-left:20px}.mr10[data-v-52b17280]{margin-right:10px}.tips-content[data-v-52b17280]{position:absolute;left:-4px;top:6px}.store-tips[data-v-52b17280]{width:200px;position:absolute;left:-10px}.underline[data-v-52b17280]{text-decoration:underline}.pickup-upload[data-v-52b17280]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-52b17280]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-52b17280]{font-size:14px}.pickup-upload .pickup-list[data-v-52b17280]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-52b17280]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-52b17280]{font-size:14px}.upload-tip-text[data-v-52b17280]{font-size:12px;color:#303133}.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-3cc0c584.ab7f0b6f.css deleted 100644 → 0
.step-text[data-v-4ec55cb6]{color:#000;font-size:14px}.dash-style[data-v-4ec55cb6]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-4ec55cb6]{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-4ec55cb6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-4ec55cb6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-4ec55cb6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-4ec55cb6]{padding:0}.w-630[data-v-4ec55cb6]{width:630px}.mb56[data-v-4ec55cb6]{margin-bottom:56px}.from-content[data-v-4ec55cb6]{position:relative}.from-content .demo-ruleForm .form-section[data-v-4ec55cb6]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-4ec55cb6]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-4ec55cb6]: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-4ec55cb6]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-4ec55cb6]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-4ec55cb6]{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-4ec55cb6]{margin-top:12px}.from-content .anchor-link[data-v-4ec55cb6]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-4ec55cb6]{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-4ec55cb6]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-4ec55cb6]:hover{color:#2f54ed}.ml20[data-v-4ec55cb6]{margin-left:20px}.mr10[data-v-4ec55cb6]{margin-right:10px}.tips-content[data-v-4ec55cb6]{position:absolute;left:-4px;top:6px}.store-tips[data-v-4ec55cb6]{width:200px;position:absolute;left:-10px}.underline[data-v-4ec55cb6]{text-decoration:underline}.pickup-upload[data-v-4ec55cb6]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-4ec55cb6]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-4ec55cb6]{font-size:14px}.pickup-upload .pickup-list[data-v-4ec55cb6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-4ec55cb6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-4ec55cb6]{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-447f9844.f11404c0.css 0 → 100644
.w260[data-v-6051396c]{width:260px}
\ No newline at end of file
dist/css/chunk-549eeab1.24d7b61b.css 0 → 100644
.empty_block[data-v-4387600e]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-4387600e]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-4387600e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-4387600e]{display:inline-block}.logistics-info span+span[data-v-4387600e]{margin-left:10px}.logistics-step[data-v-4387600e]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-4387600e]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-4387600e]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-4387600e]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-4387600e]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-4387600e]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-4387600e]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file
dist/css/chunk-6c3e2bd2.40104ddb.css 0 → 100644
[data-v-706e9436] .el-divider--horizontal{margin:16px 0;margin-top:20px;border-bottom:1px dashed #dcdfe6;background-color:transparent}.upload[data-v-706e9436] .el-button{border-style:dashed}.el-icon-warning[data-v-4e50e7a2]{color:#faad14;font-size:21px}.empty_block[data-v-0c841a2d]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-0c841a2d]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-0c841a2d]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-0c841a2d]{display:inline-block}.logistics-info span+span[data-v-0c841a2d]{margin-left:10px}.logistics-step[data-v-0c841a2d]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-0c841a2d]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-0c841a2d]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-0c841a2d]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-0c841a2d]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-0c841a2d]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-0c841a2d]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5563ffd2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5563ffd2]{margin-top:20px;color:#f5222d;font-size:20px}
\ No newline at end of file
dist/css/chunk-98488d46.7f0a1076.css deleted 100644 → 0
.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-b5001a50.96e5a474.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-6a22527c]{border-color:#1890ff}.upload-ele .el-button[data-v-6a22527c]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-6a22527c]{padding:0}.uploadText p[data-v-6a22527c]{line-height:26px}.upload-tip-text[data-v-6a22527c]{font-size:12px;color:#303133}.pickup-upload[data-v-6a22527c]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-6a22527c]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-6a22527c]{font-size:14px}.pickup-upload .pickup-list[data-v-6a22527c]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-6a22527c]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-6a22527c]{font-size:14px}.w360[data-v-4c2dc15a]{width:360px}.w-160[data-v-4c2dc15a]{width:160px}.w140[data-v-4c2dc15a]{width:140px}.w350[data-v-4c2dc15a]{width:350px}.mr4[data-v-4c2dc15a]{margin-right:4px}.tab-top[data-v-4c2dc15a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-4c2dc15a],.tab-top[data-v-4c2dc15a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-4c2dc15a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-4c2dc15a]{height:60px}.table-content .img-text img[data-v-4c2dc15a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-4c2dc15a]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-4c2dc15a]{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-4c2dc15a]{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-4c2dc15a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-4c2dc15a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-4c2dc15a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-4c2dc15a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-4c2dc15a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-4c2dc15a]:hover{color:#2f54ed}.undeline-dash[data-v-4c2dc15a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-4c2dc15a]{display:inline-block;line-height:32px}.hidden-data[data-v-4c2dc15a]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-ce92d9b2.16599cd3.css 0 → 100644
.ml8[data-v-5a5d66fc]{margin-left:8px}.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border[data-v-7a978890]{border-right:1px solid #ebeef5}.ml8[data-v-7a978890]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.w360[data-v-329b6049]{width:360px}.w-160[data-v-329b6049]{width:160px}.w140[data-v-329b6049]{width:140px}.w350[data-v-329b6049]{width:350px}.mr4[data-v-329b6049]{margin-right:4px}.tab-top[data-v-329b6049]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-329b6049],.tab-top[data-v-329b6049]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-329b6049]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-329b6049]{height:60px}.table-content .img-text img[data-v-329b6049]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-329b6049]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-329b6049]{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-329b6049]{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-329b6049]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-329b6049]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-329b6049]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-329b6049]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-329b6049]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-329b6049]:hover{color:#2f54ed}.undeline-dash[data-v-329b6049]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-329b6049]{display:inline-block;line-height:32px}.hidden-data[data-v-329b6049]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-cfac6e50.4edf6a44.css deleted 100644 → 0
.el-icon-warning[data-v-8e62a21a]{color:#faad14;font-size:21px}.write-off[data-v-5563ffd2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5563ffd2]{margin-top:20px;color:#f5222d;font-size:20px}.empty_block[data-v-aef9879e]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-aef9879e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-aef9879e]{display:inline-block}.logistics-info span+span[data-v-aef9879e]{margin-left:10px}.logistics-step[data-v-aef9879e]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-aef9879e]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-aef9879e]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-aef9879e]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-aef9879e]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-aef9879e]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.order-info[data-v-1bb9bb28]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-1bb9bb28]{width:33%;margin:10px 0}.delivery-complete[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:20px}.delivery-complete .el-icon-success[data-v-1bb9bb28]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-1bb9bb28]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-1bb9bb28]{margin-top:16px;color:#606266}.delivery-complete p[data-v-1bb9bb28]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.delivery-todo .status-text[data-v-1bb9bb28]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-1bb9bb28]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-1bb9bb28]{width:100%;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.delivery-todo .status .time[data-v-1bb9bb28]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-1bb9bb28]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:24px;width:24px;background-color:#2f54eb;color:#fff;border-radius:50%;-ms-flex-negative:0;flex-shrink:0}.delivery-todo .status i[data-v-1bb9bb28]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-1bb9bb28]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-1bb9bb28]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file
dist/css/chunk-efe5a672.c06ff0ab.css 0 → 100644
.el-icon-warning[data-v-4e50e7a2]{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-7a86c643]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.empty_block[data-v-7a86c643]{margin-top:20px}.logistics-info[data-v-7a86c643]{color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-7a86c643]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-7a86c643]{display:inline-block}.logistics-info span+span[data-v-7a86c643]{margin-left:10px}.logistics-step[data-v-7a86c643]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-7a86c643]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-7a86c643]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-7a86c643]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-7a86c643]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-7a86c643]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-7a86c643]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.order-info[data-v-3893c86c]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;color:#303133}.order-info li[data-v-3893c86c]{width:33%;margin:10px 0}.delivery-complete[data-v-3893c86c]{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-3893c86c]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-3893c86c]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-3893c86c]{margin-top:16px;color:#606266}.delivery-complete p[data-v-3893c86c]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-3893c86c]{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-3893c86c]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-3893c86c]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-3893c86c]{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-3893c86c]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-3893c86c]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-3893c86c]{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-3893c86c]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-3893c86c]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-3893c86c]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file
dist/css/chunk-fa650fdc.947036af.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}.right-border[data-v-cb6be5dc]{border-right:1px solid #ebeef5}.w360[data-v-193afb5c]{width:360px}.w-160[data-v-193afb5c]{width:160px}.w140[data-v-193afb5c]{width:140px}.w350[data-v-193afb5c]{width:350px}.mr4[data-v-193afb5c]{margin-right:4px}.tab-top[data-v-193afb5c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-193afb5c],.tab-top[data-v-193afb5c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-193afb5c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-193afb5c]{height:60px}.table-content .img-text img[data-v-193afb5c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-193afb5c]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-193afb5c]{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-193afb5c]{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-193afb5c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-193afb5c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-193afb5c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-193afb5c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-193afb5c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-193afb5c]:hover{color:#2f54ed}.undeline-dash[data-v-193afb5c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-193afb5c]{display:inline-block;line-height:32px}.hidden-data[data-v-193afb5c]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/js/chunk-5d5bbb0f.e86dbf1d.js → dist/js/chunk-5d5bbb0f.66f4c11d.js
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.3431c17e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.fb022648.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -45,7 +45,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.6.js"></script><!-- 图片上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
<script src="//web-1251519181.file.myqcloud.com/components/app-info.1.0.5.js"></script><!-- 应用信息 -->
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.4.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.15.js"></script><!-- 福利选择器 -->
......
src/components/stock-list/dialog.vue
......@@ -6,13 +6,29 @@
</el-select>
<el-input class="mr10 w300" v-model="listParams.activityName" clearable placeholder="请输入活动名称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
<el-table max-height="500" tooltip-effect="dark" v-loading="loading" :data="tableList" style="width:100%">
<el-table-column prop="appName" label="活动应用名称" min-width="120"> </el-table-column>
<el-table-column prop="activityName" label="活动名称" min-width="180"> </el-table-column>
<el-table-column prop="remainedStock" label="可用库存" min-width="120"> </el-table-column>
<el-table-column prop="preStock" v-if="type == 1 || type == 2" label="待履约库存" min-width="120"> </el-table-column>
<el-table-column prop="outStock" label="历史履约库存" min-width="120"> </el-table-column>
</el-table>
<div class="statistics">
<div class="mb20">
<el-select v-model="appCodes" class="w140 mr10" multiple placeholder="全部应用" clearable @change="changeAppCode">
<el-option v-for="item in appList" :key="item.appCode" :label="item.appName" :value="item.appCode"></el-option>
</el-select>
<el-input class="mr10 w300" v-model="listParams.activityName" clearable placeholder="请输入活动名称" @change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
</div>
<el-table max-height="500" tooltip-effect="dark" v-loading="loading" :data="tableList" style="width:100%">
<el-table-column prop="appName" label="活动应用名称" min-width="120"> </el-table-column>
<el-table-column prop="activityName" label="活动名称" min-width="180"> </el-table-column>
<el-table-column prop="remainedStock" label="可用库存" min-width="120"> </el-table-column>
<el-table-column prop="preStock" v-if="type == 1 || type == 2" label="待履约库存" min-width="120"> </el-table-column>
<el-table-column prop="outStock" label="历史履约库存" min-width="120"> </el-table-column>
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img width="50" height="50" src="../../assets/images/no-data_icon1.png" />
</div>
<p style="font-size:12px">暂无数据</p>
</div>
</template>
</el-table>
</div>
<!-- <div class="clearfix">
没有分页
<dm-pagination class="fr mb0" v-if="tableList.length" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
......@@ -114,3 +130,11 @@ export default {
}
};
</script>
<style>
.statistics .el-table__empty-block .el-table__empty-text::before{
/* width: 50px;
height: 50px; */
/* font-size: 50px; */
display: none;
}
</style>
\ No newline at end of file
src/components/stock-list/welfare-item.vue
......@@ -19,19 +19,20 @@
</div>
<div class="f2">
<el-row :gutter="10">
<el-col :span="12" class="mb20">已占用：<span>{{ info.occupyStock || 0 }}</span></el-col>
<el-col :span="12" class="mb20">总库存：<span>{{ info.totalStock || 0 }}</span></el-col>
<el-col :span="12">已履约：<span>{{ info.outStock || 0 }}</span></el-col>
<el-col :span="12" v-if="type == 1 || type == 2">待履约：<span>{{ info.preStock || 0 }}</span></el-col>
<el-col :span="12" class="mb20 gray02">已占用：<span class="gray01">{{ info.occupyStock || 0 }}</span></el-col>
<el-col :span="12" class="mb20 gray02">总库存：<span class="gray01">{{ info.totalStock || 0 }}</span></el-col>
<el-col :span="12" class="gray02">已履约：<span class="gray01">{{ info.outStock || 0 }}</span></el-col>
<el-col :span="12" class="gray02" v-if="type == 1 || type == 2">待履约：<span class="gray01">{{ info.preStock || 0 }}</span></el-col>
</el-row>
</div>
</div>
<!-- 实物礼品才有sku列表 -->
<el-table :data="skuList" v-if="type == 1 && goodsStandardInfo.length > 0" style="width: calc(100% - 40px)" max-height="200" class="ml20 mr20 mb10 el-table-list-mini-empty">
<el-table :data="skuList" v-if="type == 1 && goodsStandardInfo.length > 0" style="width: calc(100% - 0px)" max-height="300" class="mb10 el-table-list-mini-empty">
<el-table-column prop="giftSkuName" label="SKU信息" min-width="180" show-overflow-tooltip>
<template slot-scope="scope">
<div style="display:flex;align-items:center;">
<img :src="scope.row.giftSkuImgUrl" width="40" height="40" class="mr10" />
<img :src="scope.row.giftSkuImgUrl" v-if="scope.row.giftSkuImgUrl" width="40" height="40" class="mr10" />
<img src="../../assets/images/stock-img.png" v-else width="40" height="40" class="mr10" />
<span>{{ scope.row.giftSkuName || '--' }}</span>
</div>
</template>
......@@ -221,7 +222,7 @@ export default {
left: 0;
width: 60px;
height: 60px;
border-radius: 4px;
border-radius: 0px;
}
p:first-child {
padding-top: 8px;
......
src/components/stock-upload-record/index.vue
......@@ -44,7 +44,7 @@
<el-table-column label="上传结果" min-width="180px">
<template slot-scope="scope">
<div v-if="scope.row.statusFlag === 1">
成功<span class="success-color"> {{ scope.row.successNum }} </span>条，失败<span class="danger-color"> {{ scope.row.errorNum }} </span>条
成功&nbsp;<span class="success-color">{{ scope.row.successNum }}</span>&nbsp;条，失败&nbsp;<span class="danger-color">{{ scope.row.errorNum }}</span>&nbsp;条
</div>
<div v-else-if="scope.row.statusFlag === 0" class="state-point state-point-loading">上传中</div>
<div v-else class="state-point state-point-error">上传失败</div>
......
src/views/gift-manage/module/update-real-cost.vue
......@@ -15,8 +15,8 @@
<el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleBatch">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
<i class="el-icon-edit-outline"></i>
<el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
<i class="el-icon-edit-outline ml8"></i>
</el-tooltip>
</el-popover>
</template>
......@@ -25,7 +25,7 @@
</template>
</el-table-column>
</el-table>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处<i class="el-icon-edit-outline"></i>按钮进行批量设置</p>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处&nbsp;<i class="el-icon-edit-outline"></i>&nbsp;按钮进行批量设置</p>
</div>
<el-form class="mt20" v-else>
<el-form-item label="成本费用" required>
......@@ -332,7 +332,11 @@ export default {
}
};
</script>
<style scoped></style>
<style scoped>
.ml8{
margin-left: 8px;
}
</style>
<style>
.right-border {
border-right: 1px solid #ebeef5;
......@@ -343,4 +347,8 @@ export default {
.popver-button .el-button:not(.el-button--text) {
min-width: 50px;
}
.batch-style{
border-radius: 4px;
padding: 5px !important;
}
</style>
\ No newline at end of file
src/views/gift-manage/module/update-real-stock.vue
......@@ -27,8 +27,8 @@
<el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleStock">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
<i class="el-icon-edit-outline"></i>
<el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
<i class="el-icon-edit-outline ml8"></i>
</el-tooltip>
</el-popover>
</template>
......@@ -41,7 +41,7 @@
</template>
</el-table-column>
</el-table>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处<i class="el-icon-edit-outline"></i>按钮进行批量设置</p>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处&nbsp;<i class="el-icon-edit-outline"></i>&nbsp;按钮进行批量设置</p>
</div>
<!-- <el-form class="mt20" v-else :class="[ heightLoading ? 'startHeight2' : '' ]"> -->
<el-form class="mt20" v-else>
......@@ -380,6 +380,9 @@ export default {
.right-border {
border-right: 1px solid #ebeef5;
}
.ml8{
margin-left: 8px;
}
/* .startHeight1{
height: 400px;
}
......@@ -387,4 +390,9 @@ export default {
height: 200px;
} */
</style>
<style></style>
\ No newline at end of file
<style>
.batch-style{
border-radius: 4px;
padding: 5px !important;
}
</style>
\ No newline at end of file
src/views/gift-manage/module/update-virtual-stock.vue
......@@ -14,9 +14,10 @@
<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>2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
<p style="margin-bottom:10px">1.填充空缺内容，导出所有项均为必填项;</p>
<p style="margin-bottom:10px">2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p style="margin-bottom:10px">3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
<p>4.正在异步上传处理中，我们将按照顺序分批次（5000/1批次）更新库存，请稍候刷新查看库存上传结果;</p>
</div>
</el-popover>
</span>
......@@ -243,6 +244,10 @@ export default {
.uploadText p{
line-height: 26px;
}
.upload-tip-text{
font-size: 12px;
color: #303133;
}
.pickup-upload{
display: inline-block;
vertical-align: top;
......
src/views/gift-manage/real-gift-detail.vue
......@@ -39,7 +39,7 @@
</el-dropdown>
<el-checkbox v-model="isStdImg" v-if="!index" class="ml20" @change="stdImgUpload">添加规格图片</el-checkbox>
<!-- <span class="tip-warm ml20" v-if="!index">只有第一个规格的规格值可添加图片</span> -->
<span class="delete-btn" @click="deleteSku(index)"><i class="el-icon-error inline-block" style="width:14px;height:14px;"></i></span>
<span class="delete-btn" @click="deleteSku(index)"><i class="el-icon-error inline-block" style="width:16px;height:16px;font-size:16px"></i></span>
</div>
<div class="value-content" v-if="item.specName">
<span class="sku-value-title">规格值:</span>
......@@ -61,7 +61,7 @@
<p class="img-modal" v-if="v.propImg">
<i class="el-icon-delete" @click="deleteImg(v)"></i>
</p>
<p style="font-size:12px;color:#FF5152;position:absolute;bottom:-32px">请添加规格图片</p>
<p style="font-size:12px;color:#FF5152;position:absolute;bottom:-32px" v-if="!v.propImg">请添加规格图片</p>
</div>
<span class="el-icon-error" @click="deleteValue(item, v, index, n)"></span>
</div>
......@@ -110,8 +110,8 @@
<el-button type="dafault" size="small" @click="$refs.popover3.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleCostPrice">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
<i class="el-icon-edit-outline"></i>
<el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
<i class="el-icon-edit-outline ml8"></i>
</el-tooltip>
</el-popover>
</template>
......@@ -132,8 +132,8 @@
<el-button type="dafault" size="small" @click="$refs.popover2.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleStock">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
<i class="el-icon-edit-outline"></i>
<el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
<i class="el-icon-edit-outline ml8"></i>
</el-tooltip>
</el-popover>
</template>
......@@ -152,8 +152,8 @@
<el-button type="dafault" size="small" @click="$refs.popover1.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleSkuCode">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
<i class="el-icon-edit-outline"></i>
<el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
<i class="el-icon-edit-outline ml8"></i>
</el-tooltip>
</el-popover>
</template>
......@@ -172,15 +172,15 @@
<el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleBarCode">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
<i class="el-icon-edit-outline"></i>
<el-tooltip slot="reference" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
<i class="el-icon-edit-outline ml8"></i>
</el-tooltip>
</el-popover>
</template>
</el-table-column>
</el-table>
</div>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处<i class="el-icon-edit-outline"></i>按钮进行批量设置</p>
<p style="color:#909399;font-size:12px;line-height:17px;font-weight:400;margin-top:8px">可点击表格标题处&nbsp;<i class="el-icon-edit-outline"></i>&nbsp;按钮进行批量设置</p>
</el-form-item>
<el-form-item label="成本" class="w-630" prop="costPrice" :rules="[{ validator: costPriceValide, trigger: 'blur' }]">
<dm-input-amount v-model="goodsForm.costPrice" width="180" @blur="costPriceValide(goodsForm.costPrice)" :min="0" :max="999999.99" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-amount>
......@@ -194,7 +194,7 @@
<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-button slot="reference" type="text" style="margin-left:15px;font-size:12px">查看示例</el-button>
</el-popover>
</div>
</el-form-item>
......@@ -376,7 +376,7 @@ export default {
stockUseType: '', // 库存使用类型（0:占用,1:动态 , 2占用+动态）
deliveryList: [],
costPrice: '',
stock: undefined,
stock: 0,
giftNo: '',
giftBarNo: ''
},
......@@ -389,7 +389,7 @@ export default {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
costPrice: [ { required: true, message: '请输入成本', trigger: 'blur' } ],
stock: [ { required: true, message: '请输入可占用库存', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
// refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
deliveryList: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
operAuthType: [ { required: true, message: '请选择操作人权限', trigger: 'change' } ],
......@@ -1522,6 +1522,9 @@ export default {
.mb56 {
margin-bottom: 56px;
}
.ml8{
margin-left: 8px;
}
.add-sku-content{
border: 1px solid #E4E7ED;
.add-sku{
......@@ -1800,4 +1803,8 @@ export default {
.hidden-limit .dm-input__counter{
display: none;
}
.batch-style{
border-radius: 4px;
padding: 5px !important;
}
</style>
src/views/gift-manage/real-gift.vue
......@@ -35,7 +35,7 @@
<div style="height:32px">
<div class="spanclass" style="margin-left:20px;color:#303133">福利成本：</div>
<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>
<div class="spanclass" style="color:#303133">至</div>
<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;color:#303133">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
......@@ -46,7 +46,7 @@
<div class="mt20" style="height:32px;">
<div class="spanclass" style="margin-left:20px;color:#303133">可占库存：</div>
<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>
<div class="spanclass" style="color:#303133">至</div>
<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" style="color:#303133">更新时间范围：</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>
......@@ -56,15 +56,16 @@
<div class="table-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column label="礼品信息" width="300px">
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<div class="text">
<p class="goods-descript">
<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 open-delay="200" trigger="hover" class="item" placement="top">
<div>{{ scope.row.giftName }}</div>
<span class="inline-block hidden-data" slot="reference">{{ scope.row.giftName || '--' }}</span>
</el-popover>
<el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
......@@ -77,20 +78,20 @@
</el-popover>
</p>
<p class="goods-code">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<el-popover trigger="hover" open-delay="200" placement="top">
<div>
<p>福利id：{{ scope.row.giftId }}</p>
<div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question inline-block mr4"></i>
</el-tooltip>
<i class="el-icon-question inline-block mr4" slot="reference"></i>
</el-popover>
礼品编码：{{ scope.row.giftNo || '--' }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="100px">
<template slot-scope="scope">
<p class="stock-box">
<span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
......@@ -114,13 +115,13 @@
<template slot-scope="scope">
<div>
<p class="stock-box">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<el-popover open-delay="200" trigger="hover" placement="top">
<div>
<p class="goods-code">已占用：{{ scope.row.occupyStock }}</p>
<p class="goods-code">总库存：{{ scope.row.totalStock }}</p>
</div>
<i class="el-icon-question inline-block mr4" style="color:#909399"></i>
</el-tooltip>
<i class="el-icon-question inline-block mr4" slot="reference" style="color:#909399"></i>
</el-popover>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)"></i>
</p>
......@@ -698,7 +699,7 @@ export default {
line-height: 32px;
}
.hidden-data{
max-width: 180px;
max-width: 220px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -34,7 +34,7 @@
<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-button slot="reference" type="text" style="margin-left:15px;font-size:12px">查看示例</el-button>
</el-popover>
</div>
</el-form-item>
......@@ -88,9 +88,9 @@
<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>2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
<p style="margin-bottom:10px">1.请按照顺序维护表头，所有变量均为必填项;</p>
<p style="margin-bottom:10px">2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p style="margin-bottom:10px">3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
<p>4.正在异步上传处理中，我们将按照顺序分批次（5000/1批次）更新库存，请稍候刷新查看库存上传结果;</p>
</div>
</el-popover>
......@@ -129,7 +129,7 @@
</div>
<div class="form-section">
<h3>售后服务</h3>
<el-form-item prop="refundFlag" label="支持买家申请退货" required>
<el-form-item prop="refundFlag" label="支持买家申请退货">
<template>
<div>
<el-radio v-model="goodsForm.refundFlag" :label="1">支持</el-radio>
......@@ -261,7 +261,7 @@ export default {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
// marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
virCostPrice: [ { required: true, message: '请输入成本', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
// refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
// deliveryType: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
template: [ { required: true, message: '请输入发货内容', trigger: 'blur' } ]
......@@ -833,6 +833,10 @@ export default {
}
}
}
.upload-tip-text{
font-size: 12px;
color: #303133;
}
/* 规格值 */
</style>
<style>
......
src/views/gift-manage/virtual-gift.vue
......@@ -35,7 +35,7 @@
<div style="height:32px;">
<div class="spanclass" style="margin-left:20px;color:#303133">福利成本：</div>
<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>
<div class="spanclass" style="color:#303133">至</div>
<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;color:#303133">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
......@@ -46,7 +46,7 @@
<div class="mt20" style="height:32px;">
<div class="spanclass" style="margin-left:20px;color:#303133">可占库存：</div>
<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>
<div class="spanclass" style="color:#303133">至</div>
<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" style="color:#303133">更新时间范围：</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>
......@@ -56,15 +56,16 @@
<div class="table-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column label="礼品信息" width="300px">
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<div class="text">
<p class="goods-descript">
<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 open-delay="200" class="item" trigger="hover" placement="top">
<div>{{ scope.row.giftName }}</div>
<span class="inline-block hidden-data" slot="reference">{{ scope.row.giftName || '--' }}</span>
</el-popover>
<el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
......@@ -77,20 +78,20 @@
</el-popover>
</p>
<p class="goods-code">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<el-popover open-delay="200" trigger="hover" placement="top">
<div>
<p class="goods-code">福利id：{{ scope.row.giftId }}</p>
<div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question mr4"></i>
</el-tooltip>
<i class="el-icon-question mr4" slot="reference"></i>
</el-popover>
礼品编码：{{ scope.row.giftNo || '--' }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="100px">
<template slot-scope="scope">
<p class="stock-box">
<span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
......@@ -114,13 +115,13 @@
<template slot-scope="scope">
<div>
<p class="stock-box">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<el-popover open-delay="200" trigger="hover" placement="top">
<div>
<p class="goods-code">已占用：{{ scope.row.occupyStock }}</p>
<p class="goods-code">总库存：{{ scope.row.totalStock }}</p>
</div>
<i class="el-icon-question inline-block mr4" style="color:#909399"></i>
</el-tooltip>
<i class="el-icon-question inline-block mr4" slot="reference" style="color:#909399"></i>
</el-popover>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)"></i>
</p>
......@@ -771,7 +772,7 @@ export default {
line-height: 32px;
}
.hidden-data{
max-width: 180px;
max-width: 220px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
......
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