Skip to content

W
welfare
Commit 123039ad by 萱草
Options

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

# Conflicts:
#	dist/css/chunk-055e7b5b.0f6b2ff2.css
#	dist/css/chunk-055e7b5b.85a96538.css
#	dist/css/chunk-078d7642.211a6482.css
#	dist/css/chunk-2a7f1670.66a05070.css
#	dist/css/chunk-a49129fc.84ff72b7.css
#	dist/css/chunk-be9d6c3c.93ac50ff.css
#	dist/index.html
#	dist/js/app.02ae0eff.js
#	dist/js/app.49fa8960.js
#	dist/js/app.4b10f0a9.js
#	dist/js/chunk-055e7b5b.b2139e43.js
#	dist/js/chunk-078d7642.46a8bacc.js
#	dist/js/chunk-a49129fc.def4fa6f.js
#	dist/js/chunk-be9d6c3c.cd5e7ffb.js
parents 0eb6064f 3c5eb09d
Showing with 43 additions and 18 deletions
dist/css/chunk-078d7642.211a6482.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-1340c320]{width:360px}.w-160[data-v-1340c320]{width:160px}.w140[data-v-1340c320]{width:140px}.w350[data-v-1340c320]{width:350px}.tab-top[data-v-1340c320]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-1340c320],.tab-top[data-v-1340c320]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-1340c320]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-1340c320]{height:60px}.table-content .img-text img[data-v-1340c320]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-1340c320]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-1340c320]{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-1340c320]{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-1340c320]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-1340c320]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-1340c320]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-1340c320]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-1340c320]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-1340c320]:hover{color:#2f54ed}.undeline-dash[data-v-1340c320]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-1340c320]{display:inline-block;line-height:32px}.hidden-data[data-v-1340c320]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-51f3e04f.c1d0a988.css 0 → 100644
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-357df7d2]{width:360px}.w-160[data-v-357df7d2]{width:160px}.w140[data-v-357df7d2]{width:140px}.w350[data-v-357df7d2]{width:350px}.tab-top[data-v-357df7d2]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-357df7d2],.tab-top[data-v-357df7d2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-357df7d2]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-357df7d2]{height:60px}.table-content .img-text img[data-v-357df7d2]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-357df7d2]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-357df7d2]{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-357df7d2]{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-357df7d2]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-357df7d2]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-357df7d2]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-357df7d2]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-357df7d2]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-357df7d2]:hover{color:#2f54ed}.undeline-dash[data-v-357df7d2]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-357df7d2]{display:inline-block;line-height:32px}.hidden-data[data-v-357df7d2]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-5ed58741.c94169a0.css 0 → 100644
.step-text[data-v-59c95538]{color:#000;font-size:14px}.dash-style[data-v-59c95538]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-59c95538]{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-59c95538]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-59c95538]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-59c95538]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-59c95538]{padding:0}.w-630[data-v-59c95538]{width:630px}.mb56[data-v-59c95538]{margin-bottom:56px}.from-content[data-v-59c95538]{position:relative}.from-content .demo-ruleForm .form-section[data-v-59c95538]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-59c95538]{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-59c95538]: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-59c95538]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-59c95538]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-59c95538]{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-59c95538]{margin-top:12px}.from-content .anchor-link[data-v-59c95538]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-59c95538]{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-59c95538]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-59c95538]:hover{color:#2f54ed}.ml20[data-v-59c95538]{margin-left:20px}.mr10[data-v-59c95538]{margin-right:10px}.tips-content[data-v-59c95538]{position:absolute;left:-4px;top:6px}.store-tips[data-v-59c95538]{width:200px;position:absolute;left:-10px}.underline[data-v-59c95538]{text-decoration:underline}.pickup-upload[data-v-59c95538]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-59c95538]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-59c95538]{font-size:14px}.pickup-upload .pickup-list[data-v-59c95538]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-59c95538]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-59c95538]{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-a49129fc.84ff72b7.css deleted 100644 → 0
.step-text[data-v-c6d87fc4]{color:#000;font-size:14px}.dash-style[data-v-c6d87fc4]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-c6d87fc4]{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-c6d87fc4]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-c6d87fc4]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-c6d87fc4]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c6d87fc4]{padding:0}.w-630[data-v-c6d87fc4]{width:630px}.mb56[data-v-c6d87fc4]{margin-bottom:56px}.from-content[data-v-c6d87fc4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-c6d87fc4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-c6d87fc4]{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-c6d87fc4]: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-c6d87fc4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-c6d87fc4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-c6d87fc4]{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-c6d87fc4]{margin-top:12px}.from-content .anchor-link[data-v-c6d87fc4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-c6d87fc4]{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-c6d87fc4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-c6d87fc4]:hover{color:#2f54ed}.ml20[data-v-c6d87fc4]{margin-left:20px}.mr10[data-v-c6d87fc4]{margin-right:10px}.tips-content[data-v-c6d87fc4]{position:absolute;left:-4px;top:6px}.store-tips[data-v-c6d87fc4]{width:200px;position:absolute;left:-10px}.underline[data-v-c6d87fc4]{text-decoration:underline}.pickup-upload[data-v-c6d87fc4]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-c6d87fc4]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-c6d87fc4]{font-size:14px}.pickup-upload .pickup-list[data-v-c6d87fc4]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c6d87fc4]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c6d87fc4]{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-be9d6c3c.93ac50ff.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-c90abad6]{border-color:#1890ff}.upload-ele .el-button[data-v-c90abad6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c90abad6]{padding:0}.uploadText p[data-v-c90abad6]{line-height:26px}.pickup-upload[data-v-c90abad6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-c90abad6]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-c90abad6]{font-size:14px}.pickup-upload .pickup-list[data-v-c90abad6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c90abad6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c90abad6]{font-size:14px}.w360[data-v-7acfb1f4]{width:360px}.w-160[data-v-7acfb1f4]{width:160px}.w140[data-v-7acfb1f4]{width:140px}.w350[data-v-7acfb1f4]{width:350px}.tab-top[data-v-7acfb1f4]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-7acfb1f4],.tab-top[data-v-7acfb1f4]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-7acfb1f4]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-7acfb1f4]{height:60px}.table-content .img-text img[data-v-7acfb1f4]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-7acfb1f4]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-7acfb1f4]{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-7acfb1f4]{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-7acfb1f4]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-7acfb1f4]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-7acfb1f4]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-7acfb1f4]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-7acfb1f4]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-7acfb1f4]:hover{color:#2f54ed}.undeline-dash[data-v-7acfb1f4]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-7acfb1f4]{display:inline-block;line-height:32px}.hidden-data[data-v-7acfb1f4]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-e34bb126.fd1824c3.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-4f27e20e]{border-color:#1890ff}.upload-ele .el-button[data-v-4f27e20e]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-4f27e20e]{padding:0}.uploadText p[data-v-4f27e20e]{line-height:26px}.pickup-upload[data-v-4f27e20e]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-4f27e20e]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-4f27e20e]{font-size:14px}.pickup-upload .pickup-list[data-v-4f27e20e]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-4f27e20e]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-4f27e20e]{font-size:14px}.w360[data-v-517b8a46]{width:360px}.w-160[data-v-517b8a46]{width:160px}.w140[data-v-517b8a46]{width:140px}.w350[data-v-517b8a46]{width:350px}.tab-top[data-v-517b8a46]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-517b8a46],.tab-top[data-v-517b8a46]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-517b8a46]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-517b8a46]{height:60px}.table-content .img-text img[data-v-517b8a46]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-517b8a46]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-517b8a46]{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-517b8a46]{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-517b8a46]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-517b8a46]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-517b8a46]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-517b8a46]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-517b8a46]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-517b8a46]:hover{color:#2f54ed}.undeline-dash[data-v-517b8a46]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-517b8a46]{display:inline-block;line-height:32px}.hidden-data[data-v-517b8a46]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/js/chunk-34bff564.d37cc822.js → dist/js/chunk-34bff564.5c41d86f.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.d43a47d6.js → dist/js/gic-card.b253b048.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/module/update-real-cost.vue
......@@ -252,6 +252,7 @@ export default {
if(this.loading) return;
if(!this.textarea){
this.$message.error('请完善备注');
return;
}
this.loading = true;
let params = {
......
src/views/gift-manage/module/update-real-stock.vue
......@@ -177,6 +177,10 @@ export default {
},
submitProNanme() {
if(this.loading) return;
if(!this.textarea){
this.$message.error('请完善备注');
return;
}
let totalStock = 0;
this.updateList.forEach((item) =>{
totalStock = Number(totalStock) + Number(item.stock);
......
src/views/gift-manage/module/update-virtual-cost.vue
......@@ -57,6 +57,7 @@ export default {
if(this.loading) return;
if(!this.textarea){
this.$message.error('请完善备注');
return;
}
this.loading = true;
let params = {
......
src/views/gift-manage/module/update-virtual-stock.vue
......@@ -100,6 +100,14 @@ export default {
},
submitProNanme() {
console.log(this.file);
if(!this.file.name){
this.$message.error('请选择文件');
return;
}
if(!this.textarea){
this.$message.error('请完善备注');
return;
}
let params = {
giftId: this.stockData.id,
file: this.file,
......
src/views/gift-manage/real-gift-detail.vue
......@@ -295,9 +295,9 @@ export default {
if(value.split('').length > 32){
return callback(new Error('礼品编码最多32位'));
}
let regExp = /^[A-Za-z0-9\-\——]{1,32}$/;
let regExp = /^[A-Za-z0-9\-\—]{1,32}$/;
if (!regExp.test(value)) {
return callback(new Error('礼品编码只支持数字或字母或-或——'));
return callback(new Error('礼品编码只支持数字或字母或-或—'));
} else {
callback();
}
......@@ -505,7 +505,6 @@ export default {
if(res.code === '0000'){
res.result.forEach((item) =>{
this.diliveryData.shopCodeList.push(item.shopCode);
console.log(this.diliveryData.shopCodeList);
});
}else{
this.$message.error(res.message);
......@@ -1214,7 +1213,7 @@ export default {
},
/* 规格相关 end */
handleValiedSkuCode(value, key, num) {
let regExp = /^[a-zA-Z0-9\-]{1,32}$/;
let regExp = /^[a-zA-Z0-9\-\—]{1,32}$/;
if (value) {
if (!regExp.test(value)) {
this.$message.error('sku编码只能是数字或字母或-且最多32个字符');
......
src/views/gift-manage/real-gift.vue
......@@ -158,8 +158,10 @@
<el-table-column label="操作" min-width="170px" fixed="right">
<template slot-scope="scope">
<div style="font-size:0px">
<dm-perm-button type="text" @click="edit(scope.row, 2)">编辑</dm-perm-button>
<dm-perm-button type="text" @click="$router.push('/gift-manage/real-stock-list?id=' + scope.row.giftId)">库存记录</dm-perm-button>
<el-button type="text" @click="edit(scope.row, 2)">编辑</el-button>
<el-button type="text" @click="$router.push('/gift-manage/real-stock-list?id=' + scope.row.giftId)">库存记录</el-button>
<!-- <dm-perm-button type="text" @click="edit(scope.row, 2)">编辑</dm-perm-button>
<dm-perm-button type="text" @click="$router.push('/gift-manage/real-stock-list?id=' + scope.row.giftId)">库存记录</dm-perm-button> -->
<dm-delete v-if="scope.row.statusFlag === 0" @confirm="changeStatus(scope.row)" tips="是否启用？">
<el-button type="text">启用</el-button>
</dm-delete>
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -145,8 +145,10 @@
</el-form-item>
</div>
<div class="fixed-btn">
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</dm-perm-button>
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</dm-perm-button>
<el-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</el-button>
<el-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</el-button>
<!-- <dm-perm-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</dm-perm-button>
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</dm-perm-button> -->
</div>
</el-form>
</div>
......@@ -175,9 +177,12 @@ export default {
data() {
let validateGoodsCode = (rule, value, callback) => {
if (value) {
if(value.split('').length > 32){
return callback(new Error('礼品编码最多32位'));
}
let regExp = /^[A-Za-z0-9\-\——]{1,32}$/;
if (!regExp.test(value)) {
return callback(new Error('只支持数字或字母或-或——'));
return callback(new Error('礼品编码只支持数字或字母或-或—'));
} else {
callback();
}
......@@ -187,6 +192,9 @@ export default {
};
let validateGoodsBarCode = (rule, value, callback) => {
if (value) {
if(value.split('').length > 32){
return callback(new Error('礼品条形码最多32位'));
}
let regExp = /^[a-zA-Z0-9]{1,32}$/;
if (!regExp.test(value)) {
return callback(new Error('条形码只能是数字或字母'));
......
src/views/gift-manage/virtual-gift.vue
......@@ -64,7 +64,7 @@
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="click" @show="getName(scope.row.giftName)">
<el-popover placement="top" trigger="hover" @show="getName(scope.row.giftName)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
</div>
......@@ -158,8 +158,10 @@
<el-table-column label="操作" min-width="210px" fixed="right">
<template slot-scope="scope">
<div style="font-size:0px">
<dm-perm-button type="text" @click="edit(scope.row, 2)">编辑</dm-perm-button>
<dm-perm-button type="text" @click="$router.push('/gift-manage/virtual-stock-list?id=' + scope.row.giftId)">库存记录</dm-perm-button>
<el-button type="text" @click="edit(scope.row, 2)">编辑</el-button>
<el-button type="text" @click="$router.push('/gift-manage/virtual-stock-list?id=' + scope.row.giftId)">库存记录</el-button>
<!-- <dm-perm-button type="text" @click="edit(scope.row, 2)">编辑</dm-perm-button>
<dm-perm-button type="text" @click="$router.push('/gift-manage/virtual-stock-list?id=' + scope.row.giftId)">库存记录</dm-perm-button> -->
<el-dropdown style="margin-left:20px;" @command="command => handleCommand(command, scope.row)" placement="bottom-start">
<span class="el-dropdown-link" style="color:#2f54ed;cursor: pointer;"> <i class="el-icon-more"></i> </span>
<el-dropdown-menu slot="dropdown" style="width:110px;">
......
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