Commit cdadfca3 by 萱草

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

# Conflicts:
#	dist/index.html
#	dist/js/app.3f603642.js
#	dist/js/card-package.d4487040.js
#	dist/js/card-package~gic-card.639ac33a.js
#	src/views/gift-manage/real-stock-list.vue
#	src/views/gift-manage/virtual-stock-list.vue
parents 09d0606a 072dd52f
.el-icon-delete[data-v-699be543]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-699be543]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.el-icon-delete[data-v-21a2f2de]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-21a2f2de]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.tab-top[data-v-2ec87d6f]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-2ec87d6f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-2ec87d6f]{height:60px}.table-content .img-text img[data-v-2ec87d6f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-2ec87d6f]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-2ec87d6f]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-2ec87d6f]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-2ec87d6f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-2ec87d6f]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-2ec87d6f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-2ec87d6f]:hover{color:#2f54ed}.undeline-dash[data-v-2ec87d6f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-2ec87d6f]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
.tab-top[data-v-c6ccc548]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-c6ccc548]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-c6ccc548]{height:60px}.table-content .img-text img[data-v-c6ccc548]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-c6ccc548]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-c6ccc548]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-c6ccc548]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-c6ccc548]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-c6ccc548]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-c6ccc548]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-c6ccc548]:hover{color:#2f54ed}.undeline-dash[data-v-c6ccc548]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-c6ccc548]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
.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}.tab-top[data-v-d7b56106]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-d7b56106],.tab-top[data-v-d7b56106]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-d7b56106]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-d7b56106]{height:60px}.table-content .img-text img[data-v-d7b56106]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-d7b56106]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-d7b56106]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-d7b56106]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-d7b56106]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-d7b56106]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-d7b56106]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-d7b56106]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-d7b56106]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-d7b56106]:hover{color:#2f54ed}.undeline-dash[data-v-d7b56106]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-d7b56106]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.tab-top[data-v-25b0541e]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-25b0541e],.tab-top[data-v-25b0541e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-25b0541e]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-25b0541e]{height:60px}.table-content .img-text img[data-v-25b0541e]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-25b0541e]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-25b0541e]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-25b0541e]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-25b0541e]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-25b0541e]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-25b0541e]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-25b0541e]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-25b0541e]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-25b0541e]:hover{color:#2f54ed}.undeline-dash[data-v-25b0541e]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-25b0541e]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
.step-text[data-v-2689167d]{color:#000;font-size:14px}.dash-style[data-v-2689167d]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-2689167d]{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-2689167d]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-2689167d]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-2689167d]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-2689167d]{padding:0}.w-630[data-v-2689167d]{width:630px}.mb56[data-v-2689167d]{margin-bottom:56px}.from-content[data-v-2689167d]{position:relative}.from-content .demo-ruleForm .form-section[data-v-2689167d]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-2689167d]{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-2689167d]: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-2689167d]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-2689167d]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-2689167d]{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-2689167d]{margin-top:12px}.from-content .anchor-link[data-v-2689167d]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-2689167d]{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-2689167d]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-2689167d]:hover{color:#2f54ed}.ml20[data-v-2689167d]{margin-left:20px}.mr10[data-v-2689167d]{margin-right:10px}.tips-content[data-v-2689167d]{position:absolute;left:-4px;top:6px}.store-tips[data-v-2689167d]{width:200px;position:absolute;left:-10px}.underline[data-v-2689167d]{text-decoration:underline}.pickup-upload[data-v-2689167d]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-2689167d]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-2689167d]{font-size:14px}.pickup-upload .pickup-list[data-v-2689167d]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-2689167d]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-2689167d]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.tab-top[data-v-db70aeb8]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-db70aeb8],.tab-top[data-v-db70aeb8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-db70aeb8]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-db70aeb8]{height:60px}.table-content .img-text img[data-v-db70aeb8]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-db70aeb8]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-db70aeb8]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-db70aeb8]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-db70aeb8]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-db70aeb8]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-db70aeb8]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-db70aeb8]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-db70aeb8]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-db70aeb8]:hover{color:#2f54ed}.undeline-dash[data-v-db70aeb8]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-db70aeb8]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
.step-text[data-v-2df2d33e]{color:#000;font-size:14px}.dash-style[data-v-2df2d33e]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-2df2d33e]{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-2df2d33e]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-2df2d33e]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-2df2d33e]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-2df2d33e]{padding:0}.w-630[data-v-2df2d33e]{width:630px}.mb56[data-v-2df2d33e]{margin-bottom:56px}.from-content[data-v-2df2d33e]{position:relative}.from-content .demo-ruleForm .form-section[data-v-2df2d33e]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-2df2d33e]{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-2df2d33e]: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-2df2d33e]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-2df2d33e]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-2df2d33e]{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-2df2d33e]{margin-top:12px}.from-content .anchor-link[data-v-2df2d33e]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-2df2d33e]{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-2df2d33e]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-2df2d33e]:hover{color:#2f54ed}.ml20[data-v-2df2d33e]{margin-left:20px}.mr10[data-v-2df2d33e]{margin-right:10px}.tips-content[data-v-2df2d33e]{position:absolute;left:-4px;top:6px}.store-tips[data-v-2df2d33e]{width:200px;position:absolute;left:-10px}.underline[data-v-2df2d33e]{text-decoration:underline}.pickup-upload[data-v-2df2d33e]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-2df2d33e]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-2df2d33e]{font-size:14px}.pickup-upload .pickup-list[data-v-2df2d33e]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-2df2d33e]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-2df2d33e]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
.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}.tab-top[data-v-3832e7b1]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-3832e7b1],.tab-top[data-v-3832e7b1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-3832e7b1]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-3832e7b1]{height:60px}.table-content .img-text img[data-v-3832e7b1]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-3832e7b1]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-3832e7b1]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-3832e7b1]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-3832e7b1]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-3832e7b1]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-3832e7b1]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-3832e7b1]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-3832e7b1]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-3832e7b1]:hover{color:#2f54ed}.undeline-dash[data-v-3832e7b1]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-3832e7b1]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
<template>
<el-dialog title="查看内容" :visible.sync="dialogVisible" width="500px" @close="cancelSubmit()">
<div v-loading="loading">
<div v-if="!isEdit" style="background: #F7F8FA;margin-bottom:20px">
<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="getSearchList" @clear="getSearchList"></el-input>
</div>
......@@ -25,7 +28,7 @@
<script>
// import request from '../service/request.js';
import api from '@/api/gift.js';
const { virtualCardList } = api;
const { virtualCardList, giftGet } = api;
export default {
props: {
dialogId: {
......@@ -33,6 +36,12 @@ export default {
default() {
return '';
}
},
isEdit: {
type: Boolean,
default() {
return false;
}
}
},
data() {
......@@ -43,12 +52,16 @@ export default {
pageSize: 10,
total: '',
tableData: [],
template: ''
};
},
mounted() {
this.dialogVisible = true;
this.giftId = this.dialogId;
this.getTableList();
if(!this.isEdit){
this.getMess();
}
},
methods: {
getTableList(){
......@@ -66,6 +79,18 @@ export default {
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
getMess(){
let params = {
id: this.giftId
};
giftGet(params).then(res => {
if(res.code === '0000'){
this.template = res.result.template || '';
}else{
this.$message.error(res.message);
}
});
},
// submitProNanme() {
// this.dialogVisible = false;
// // setInterval(() => {
......
......@@ -8,7 +8,7 @@
</el-table-column>
<el-table-column label="当前可占用" width="130px">
<template slot-scope="scope">
{{ skuSellObj[scope.row.mapId].remainedStock }}
{{ skuSellObj[scope.row.mapId].remainedStock || '--' }}
</template>
</el-table-column>
<el-table-column label="库存">
......
......@@ -323,6 +323,15 @@ export default {
console.log(this.tableData);
});
},
handleSizeChange(value){
this.query.pageSize = value;
this.getTableList();
},
handleCurrentChange(value){
this.query.pageNum = value;
this.query.pageSize = 1;
this.getTableList();
},
// 展开与收起
handleUnfold(){
this.unfoldStatus = !this.unfoldStatus;
......
<template>
<stock-list :welfare-id="$route.query.id" type="1"></stock-list>
<stock-list :welfare-id="$route.query.id" :type="1"></stock-list>
</template>
<script>
......
......@@ -42,7 +42,7 @@
</el-table-column>
</el-table>
<div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
<div class="pagination">
<div class="pagination" style="text-align:right">
<dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total" v-if="total != 0"> </dm-pagination>
</div>
</div>
......@@ -105,7 +105,7 @@ export default {
proType: '',
status: '',
batchOperate: '',
total: 0,
// total: 0,
sortOrder: '',
sortColumn: '',
tableData: [],
......@@ -121,6 +121,7 @@ export default {
endTime: '',
currentPage: 1,
pageSize: 20,
total: '',
currentErrorPage: 1,
pageErrorSize: 20,
searchType: 1,
......@@ -128,7 +129,8 @@ export default {
isShow: false,
timeValue: [ new Date() - 7 * 24 * 60 * 60 * 1000, new Date().valueOf() ],
dialogVisible: false,
totalError: ''
totalError: '',
uploadLogId: ''
};
},
created() {
......@@ -141,8 +143,13 @@ export default {
init() {
this.getTableList();
},
getSearchList() {
this.pageNum = 1;
handleCurrentChange(value) {
this.currentPage = value;
this.getTableList();
},
handleSizeChange(value){
this.pageSize = value;
this.currentPage = 1;
this.getTableList();
},
changeTime(){
......@@ -186,13 +193,27 @@ export default {
virtualUploadLog(params).then(res =>{
console.log(res);
this.tableData = res.result.result || [];
this.total = res.result.totalCount || '';
console.log(this.tableData);
});
},
checkDetail(item){
this.dialogVisible = true;
this.uploadLogId = item.uploadLogId;
this.getDetail();
},
handleSizeErrorChange(value){
this.pageErrorSize = value;
this.getDetail();
},
handleCurrentErrorChange(value){
this.currentErrorPage = value;
this.pageErrorSize = 1;
this.getDetail();
},
getDetail(){
let params = {
id: item.uploadLogId,
id: this.uploadLogId,
key: '',
pageNum: this.currentErrorPage,
pageSize: this.pageErrorSize,
......
......@@ -170,7 +170,7 @@
</div>
</el-form>
</div>
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId"></check-upload-detail>
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId" :is-edit="true"></check-upload-detail>
</div>
</template>
<script>
......
......@@ -199,7 +199,7 @@
<!-- <update-stock :stock-data="stockData" v-if="StockDialog" @getTableList="getTableList" @closeUpdateStock="closeUpdateStock"></update-stock> -->
<update-virtual-stock :stock-data="stockData" v-if="StockDialog" @getTableList="getTableList" @closeUpdateStock="closeUpdateStock"></update-virtual-stock>
<!-- <goods-stock :stock-data="stockData" v-if="StockDialog" @getList="getList" @closeStock="closeStock"></goods-stock> -->
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId"></check-upload-detail>
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId" :is-edit="false"></check-upload-detail>
</div>
</template>
<script>
......@@ -350,6 +350,15 @@ export default {
console.log(this.tableData);
});
},
handleSizeChange(value){
this.query.pageSize = value;
this.getTableList();
},
handleCurrentChange(value){
this.query.pageNum = value;
this.query.pageSize = 1;
this.getTableList();
},
closeUploadDetail(){
this.dialogVisible = false;
},
......
<template>
<stock-list :welfare-id="$route.query.id" type="2"></stock-list>
<stock-list :welfare-id="$route.query.id" :type="2"></stock-list>
</template>
<script>
......
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