Skip to content

W
welfare
Commit 4a785987 by 萱草
Options

update: bug修复

parent 8574c7a3
Showing with 46 additions and 39 deletions
dist/css/chunk-3a00490d.25bb4e21.css 0 → 100644
.step-text[data-v-cba8a022]{color:#000;font-size:14px}.dash-style[data-v-cba8a022]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-cba8a022]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-cba8a022]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-cba8a022]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-cba8a022]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-cba8a022]{padding:0}.w-630[data-v-cba8a022]{width:630px}.mb56[data-v-cba8a022]{margin-bottom:56px}.from-content[data-v-cba8a022]{position:relative}.from-content .demo-ruleForm .form-section[data-v-cba8a022]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-cba8a022]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-cba8a022]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-cba8a022]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-cba8a022]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-cba8a022]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-cba8a022]{margin-top:12px}.from-content .anchor-link[data-v-cba8a022]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-cba8a022]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-cba8a022]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-cba8a022]:hover{color:#2f54ed}.ml20[data-v-cba8a022]{margin-left:20px}.mr10[data-v-cba8a022]{margin-right:10px}.tips-content[data-v-cba8a022]{position:absolute;left:-4px;top:6px}.store-tips[data-v-cba8a022]{width:200px;position:absolute;left:-10px}.underline[data-v-cba8a022]{text-decoration:underline}.pickup-upload[data-v-cba8a022]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-cba8a022]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-cba8a022]{font-size:14px}.pickup-upload .pickup-list[data-v-cba8a022]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-cba8a022]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-cba8a022]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-47725810.3c690e6f.css deleted 100644 → 0
.step-text[data-v-7dbe4afe]{color:#000;font-size:14px}.dash-style[data-v-7dbe4afe]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-7dbe4afe]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-7dbe4afe]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-7dbe4afe]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-7dbe4afe]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-7dbe4afe]{padding:0}.w-630[data-v-7dbe4afe]{width:630px}.mb56[data-v-7dbe4afe]{margin-bottom:56px}.from-content[data-v-7dbe4afe]{position:relative}.from-content .demo-ruleForm .form-section[data-v-7dbe4afe]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-7dbe4afe]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-7dbe4afe]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-7dbe4afe]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-7dbe4afe]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-7dbe4afe]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-7dbe4afe]{margin-top:12px}.from-content .anchor-link[data-v-7dbe4afe]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-7dbe4afe]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-7dbe4afe]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-7dbe4afe]:hover{color:#2f54ed}.ml20[data-v-7dbe4afe]{margin-left:20px}.mr10[data-v-7dbe4afe]{margin-right:10px}.tips-content[data-v-7dbe4afe]{position:absolute;left:-4px;top:6px}.store-tips[data-v-7dbe4afe]{width:200px;position:absolute;left:-10px}.underline[data-v-7dbe4afe]{text-decoration:underline}.pickup-upload[data-v-7dbe4afe]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7dbe4afe]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7dbe4afe]{font-size:14px}.pickup-upload .pickup-list[data-v-7dbe4afe]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7dbe4afe]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7dbe4afe]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-79acfdd1.25f4b9f6.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-b60ae704]{width:360px}.w-160[data-v-b60ae704]{width:160px}.w140[data-v-b60ae704]{width:140px}.w350[data-v-b60ae704]{width:350px}.tab-top[data-v-b60ae704]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-b60ae704],.tab-top[data-v-b60ae704]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-b60ae704]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-b60ae704]{height:60px}.table-content .img-text img[data-v-b60ae704]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-b60ae704]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-b60ae704]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-b60ae704]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-b60ae704]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-b60ae704]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-b60ae704]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-b60ae704]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-b60ae704]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-b60ae704]:hover{color:#2f54ed}.undeline-dash[data-v-b60ae704]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-b60ae704]{display:inline-block;line-height:32px}.hidden-data[data-v-b60ae704]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-7acaf2c4.eed923d5.css deleted 100644 → 0
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-4f27e20e]{border-color:#1890ff}.upload-ele .el-button[data-v-4f27e20e]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-4f27e20e]{padding:0}.uploadText p[data-v-4f27e20e]{line-height:26px}.pickup-upload[data-v-4f27e20e]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-4f27e20e]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-4f27e20e]{font-size:14px}.pickup-upload .pickup-list[data-v-4f27e20e]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-4f27e20e]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-4f27e20e]{font-size:14px}.w360[data-v-0fc9b23f]{width:360px}.w-160[data-v-0fc9b23f]{width:160px}.w140[data-v-0fc9b23f]{width:140px}.w350[data-v-0fc9b23f]{width:350px}.tab-top[data-v-0fc9b23f]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0fc9b23f],.tab-top[data-v-0fc9b23f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0fc9b23f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0fc9b23f]{height:60px}.table-content .img-text img[data-v-0fc9b23f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0fc9b23f]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-0fc9b23f]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-0fc9b23f]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-0fc9b23f]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0fc9b23f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0fc9b23f]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0fc9b23f]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0fc9b23f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0fc9b23f]:hover{color:#2f54ed}.undeline-dash[data-v-0fc9b23f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0fc9b23f]{display:inline-block;line-height:32px}.hidden-data[data-v-0fc9b23f]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-8a64bbc2.87b68e95.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-30465c69]{border-color:#1890ff}.upload-ele .el-button[data-v-30465c69]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-30465c69]{padding:0}.uploadText p[data-v-30465c69]{line-height:26px}.pickup-upload[data-v-30465c69]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-30465c69]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-30465c69]{font-size:14px}.pickup-upload .pickup-list[data-v-30465c69]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-30465c69]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-30465c69]{font-size:14px}.w360[data-v-440ea296]{width:360px}.w-160[data-v-440ea296]{width:160px}.w140[data-v-440ea296]{width:140px}.w350[data-v-440ea296]{width:350px}.tab-top[data-v-440ea296]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-440ea296],.tab-top[data-v-440ea296]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-440ea296]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-440ea296]{height:60px}.table-content .img-text img[data-v-440ea296]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-440ea296]{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-440ea296]{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-440ea296]{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-440ea296]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-440ea296]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-440ea296]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-440ea296]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-440ea296]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-440ea296]:hover{color:#2f54ed}.undeline-dash[data-v-440ea296]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-440ea296]{display:inline-block;line-height:32px}.hidden-data[data-v-440ea296]{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-db3598a0.7f821c04.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-0928da8c]{width:360px}.w-160[data-v-0928da8c]{width:160px}.w140[data-v-0928da8c]{width:140px}.w350[data-v-0928da8c]{width:350px}.tab-top[data-v-0928da8c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0928da8c],.tab-top[data-v-0928da8c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0928da8c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0928da8c]{height:60px}.table-content .img-text img[data-v-0928da8c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0928da8c]{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-0928da8c]{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-0928da8c]{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-0928da8c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0928da8c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0928da8c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0928da8c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0928da8c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0928da8c]:hover{color:#2f54ed}.undeline-dash[data-v-0928da8c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0928da8c]{display:inline-block;line-height:32px}.hidden-data[data-v-0928da8c]{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.a5bee281.js → dist/js/chunk-34bff564.d2801cb5.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.3646d58f.js → dist/js/gic-card.b454be6f.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -47,7 +47,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/app-info.1.0.5.js"></script><!-- 应用信息 -->
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.11.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.12.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.11.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
......
src/components/stock-list/index.vue
......@@ -71,7 +71,7 @@ export default {
loading: false,
dateTime: [ new Date() - 7 * 24 * 60 * 60 * 1000, new Date() ],
listParams: {
// welfareId: this.welfareId,
welfareId: this.welfareId,
welfareSkuId: '',
modifyType: '', // 调整类型(1:加，2:减)
startDate: '',
......@@ -105,7 +105,7 @@ export default {
this.refresh();
},
getAppList() {
getAppList().then(res => {
getAppList({ welfareId: this.welfareId }).then(res => {
this.appList = res.result || [];
});
},
......
src/views/gift-manage/module/check-upload-detail.vue
......@@ -5,7 +5,7 @@
<div v-html="template" style="font-size:12px;line-height:22px"></div>
</div>
<div>
<el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getTableList" @clear="getTableList"></el-input>
<el-input placeholder="请输入会员信息搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @change="getTableList" @clear="getTableList"></el-input>
</div>
<el-table :data="tableData" class="mt20">
<el-table-column v-for="(item, index) in headList" :key="index" :label="item" :prop="index === 0 ? 'paramOne' : (index === 1 ? 'paramTwo' : 'paramThree')"></el-table-column>
......@@ -80,16 +80,18 @@ export default {
console.log(res);
this.tableData = res.result.result || [];
let list = [];
list = this.tableData[0].headList;
this.headList = list.map((item, index) => {
if(item.indexOf('<span style="text-decoration: underline">') != -1){
item = item.replace('<span style="text-decoration: underline">', '');
}
if(item.indexOf('</span>') != -1){
item = item.replace('</span>', '');
}
return item;
});
list = this.tableData.length ? this.tableData[0].headList : [];
if(list.length){
this.headList = list.map((item, index) => {
if(item.indexOf('<span style="text-decoration: underline">') != -1){
item = item.replace('<span style="text-decoration: underline">', '');
}
if(item.indexOf('</span>') != -1){
item = item.replace('</span>', '');
}
return item;
});
}
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
......
src/views/gift-manage/module/update-real-cost.vue
......@@ -36,7 +36,7 @@
<el-form class="mt20">
<el-form-item label="调整备注" required>
<template>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</template>
</el-form-item>
</el-form>
......
src/views/gift-manage/module/update-real-stock.vue
......@@ -55,7 +55,7 @@
<el-form class="mt20">
<el-form-item label="调整备注" required>
<template>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</template>
</el-form-item>
</el-form>
......
src/views/gift-manage/module/update-virtual-cost.vue
......@@ -10,7 +10,7 @@
</el-form-item>
<el-form-item label="调整备注" required>
<template>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input style="width:260px" type="textarea" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</template>
</el-form-item>
</el-form>
......
src/views/gift-manage/module/update-virtual-stock.vue
......@@ -31,7 +31,7 @@
</div>
</el-form-item>
<el-form-item label="调整备注" required>
<el-input type="textarea" style="width:260px" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="240" show-word-limit></el-input>
<el-input type="textarea" style="width:260px" :rows="3" placeholder="请填入调整备注" v-model="textarea" :maxlength="120" show-word-limit></el-input>
</el-form-item>
</el-form>
</div>
......@@ -111,7 +111,8 @@ export default {
let params = {
giftId: this.stockData.id,
file: this.file,
remark: this.textarea
remark: this.textarea,
giftName: this.stockData.giftName
};
console.log(params.file);
this.loading = true;
......
src/views/gift-manage/real-gift-detail.vue
......@@ -299,6 +299,7 @@ export default {
return callback(new Error('成本只能是数字'));
}
}
callback();
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
......@@ -420,8 +421,9 @@ export default {
maxlength: 5, // 图片数量 默认 5
image: [],
// 规格值图片上传
uploadAction: window.location.origin + '/welfare/upload/upload-image',
// uploadAction: 'https://four.gicdev.com/welfare/upload/upload-image',
uploadAction: window.location.origin + '/api-marketing/upload/upload-image',
// uploadAction: 'https://four.gicdev.com/api-marketing/upload/upload-image',
// uploadAction: '/welfare/upload/upload-image',
openStorePick: 0,
btnLoading: false,
loading: false,
......
src/views/gift-manage/real-gift.vue
......@@ -34,9 +34,9 @@
<div style="margin: 20px 20px 0px 20px;" v-if="unfoldStatus">
<div style="height:32px;">
<div class="spanclass">福利成本：</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass">-</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass" style="margin-right:28px">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
<el-option label="由近及远" :value="0"></el-option>
......@@ -45,9 +45,9 @@
</div>
<div class="mt20" style="height:32px;">
<div class="spanclass">可占库存：</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">-</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 mr40 w140" v-model="query.endStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 mr40 w140" v-model="query.endStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">更新时间范围：</div>
<el-date-picker v-model="timeValue" @change="changeTime" type="datetimerange" class="w350" align="right" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</div>
......@@ -276,7 +276,7 @@ export default {
},
methods: {
init() {
this.searchType = 1;
// this.searchType = 1;
this.getTableList();
},
getSearchList() {
......@@ -300,7 +300,7 @@ export default {
} else if (this.query.type === 0) {
this.placeholderText = '请输入福利id';
}
console.log(this.searchType);
// console.log(this.searchType);
},
// 实物礼品列表
getTableList() {
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -80,7 +80,7 @@
:on-success="successUpload"
accept=".xls,.xlsx"
:before-upload="beforeUploadFile"
:data="{ giftId: giftId, remark: '' }"
:data="{ giftId: giftId, remark: '', giftName: goodsForm.giftName }"
with-credentials>
<el-button class="upload-trigger"><i class="iconfont-components4 icon-cp-shangc upload-icon"></i> 上传</el-button>
<span slot="tip" class="upload-tip inline-block">
......@@ -183,6 +183,7 @@ export default {
return callback(new Error('成本只能是数字'));
}
}
callback();
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
......
src/views/gift-manage/virtual-gift.vue
......@@ -34,9 +34,9 @@
<div style="margin: 20px 20px 0px 20px;" v-if="unfoldStatus">
<div style="height:32px;">
<div class="spanclass">福利成本：</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr10 ml10" v-model.trim="query.startCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass">-</div>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @keyup.enter.native="getSearchList"></dm-input-amount>
<dm-input-amount precision="2" :min="0" :max="9999999.99" class="mr40 ml10" v-model.trim="query.endCostPrice" @change="getSearchList"></dm-input-amount>
<div class="spanclass" style="margin-right:28px">更新时间：</div>
<el-select v-model="sortData" placeholder="由近及远" clearable class="w-160 mr10 more-select" @change="handleSort">
<el-option label="由近及远" :value="0"></el-option>
......@@ -45,9 +45,9 @@
</div>
<div class="mt20" style="height:32px;">
<div class="spanclass">可占库存：</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="mr10 ml10 w140" v-model="query.startStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">-</div>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 w140 mr40" v-model="query.endStock" placeholder="请输入" @keyup.enter.native="getSearchList"></dm-input-number>
<dm-input-number precision="0" :min="0" :max="9999999" class="ml10 w140 mr40" v-model="query.endStock" placeholder="请输入" @change="getSearchList"></dm-input-number>
<div class="spanclass">更新时间范围：</div>
<el-date-picker v-model="timeValue" @change="changeTime" type="datetimerange" class="w350" align="right" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']"></el-date-picker>
</div>
......@@ -276,6 +276,7 @@ export default {
id: '',
remainedStock: '',
textarea: '',
giftName: ''
},
StockDialog: false,
integralDialog: false,
......@@ -636,7 +637,7 @@ export default {
updateStock(item) {
this.stockData.id = item.giftId;
this.stockData.remainedStock = item.remainedStock;
this.stockData.textarea = item.textarea;
this.stockData.giftName = item.giftName;
this.StockDialog = true;
},
closeUpdateStock() {
......
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