Skip to content

W
welfare
Commit defa8cbd by 萱草
Options

update: 更改

parent 3201c61c
Showing with 59 additions and 16 deletions
dist/css/chunk-2b99ab5f.9eb96d8f.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}.tab-top[data-v-8b73433c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-8b73433c],.tab-top[data-v-8b73433c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-8b73433c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-8b73433c]{height:60px}.table-content .img-text img[data-v-8b73433c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-8b73433c]{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-8b73433c]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-8b73433c]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-8b73433c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-8b73433c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-8b73433c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-8b73433c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-8b73433c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-8b73433c]:hover{color:#2f54ed}.undeline-dash[data-v-8b73433c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-8b73433c]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-2b9b8092.f18d7179.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-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-db14d510]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-db14d510],.tab-top[data-v-db14d510]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-db14d510]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-db14d510]{height:60px}.table-content .img-text img[data-v-db14d510]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-db14d510]{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-db14d510]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-db14d510]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-db14d510]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-db14d510]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-db14d510]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-db14d510]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-db14d510]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-db14d510]:hover{color:#2f54ed}.undeline-dash[data-v-db14d510]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-db14d510]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-7a226a22.e53267e4.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}.tab-top[data-v-dd74c7f6]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-dd74c7f6],.tab-top[data-v-dd74c7f6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-dd74c7f6]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-dd74c7f6]{height:60px}.table-content .img-text img[data-v-dd74c7f6]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-dd74c7f6]{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-dd74c7f6]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-dd74c7f6]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-dd74c7f6]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-dd74c7f6]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-dd74c7f6]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-dd74c7f6]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-dd74c7f6]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-dd74c7f6]:hover{color:#2f54ed}.undeline-dash[data-v-dd74c7f6]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-dd74c7f6]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-c6adf6a0.c017f21f.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-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-784c961c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-784c961c],.tab-top[data-v-784c961c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-784c961c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-784c961c]{height:60px}.table-content .img-text img[data-v-784c961c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-784c961c]{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-784c961c]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-784c961c]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-784c961c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-784c961c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-784c961c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-784c961c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-784c961c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-784c961c]:hover{color:#2f54ed}.undeline-dash[data-v-784c961c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-784c961c]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
src/views/gift-manage/real-gift.vue
......@@ -145,8 +145,14 @@
<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 v-if="scope.row.statusFlag === 0" type="text" @click="changeStatus(scope.row)">禁用</el-button>
<el-button type="text" v-if="scope.row.statusFlag === 1" @click="changeStatus(scope.row)">启用</el-button>
<!-- <el-button v-if="scope.row.statusFlag === 0" type="text" @click="changeStatus(scope.row)">禁用</el-button> -->
<dm-delete v-if="scope.row.statusFlag === 0" @confirm="changeStatus(scope.row)" tips="是否禁用？">
<el-button type="text">禁用</el-button>
</dm-delete>
<dm-delete v-if="scope.row.statusFlag === 1" @confirm="changeStatus(scope.row)" tips="是否启用？">
<el-button type="text">启用</el-button>
</dm-delete>
<!-- <el-button type="text" v-if="scope.row.statusFlag === 1" @click="changeStatus(scope.row)">启用</el-button> -->
</div>
</template>
</el-table-column>
......
src/views/gift-manage/virtual-gift.vue
......@@ -147,11 +147,13 @@
<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-arrow-down el-icon--right"></i> </span>
<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;">
<el-dropdown-item command="1">查看记录</el-dropdown-item>
<el-dropdown-item command="2" v-if="scope.row.statusFlag === 0" @click="changeStatus(scope.row)">禁用</el-dropdown-item>
<el-dropdown-item command="3" v-if="scope.row.statusFlag === 1" @click="changeStatus(scope.row)">启用</el-dropdown-item>
<el-dropdown-item command="1">查看内容</el-dropdown-item>
<el-dropdown-item command="2" v-if="scope.row.statusFlag === 0">禁用</el-dropdown-item>
<el-dropdown-item command="3" v-if="scope.row.statusFlag === 1">启用</el-dropdown-item>
<!-- <el-dropdown-item command="2" v-if="scope.row.statusFlag === 0" @click="changeStatus(scope.row)">禁用</el-dropdown-item>
<el-dropdown-item command="3" v-if="scope.row.statusFlag === 1" @click="changeStatus(scope.row)">启用</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -333,13 +335,48 @@ export default {
console.log(this.tableData);
});
},
handleCommand(value1, value2){
console.log(value1);
console.log(value2);
if(value1 == 1){
handleCommand(command, item){
// let value;
if(command == 1){
this.dialogVisible = true;
}else if(value1 == 2){
this.forbiddenDialog = true;
}else if(command == 2){
let params = {
giftIdList: [ item.giftId ],
type: 2
};
this.$confirm('<div>已添加被禁用礼品的活动将会失效，确认禁用?</div>', '提示', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '禁用',
showCancelButton: false
}).then(() =>{
this.batchRequest(params);
}).catch(() => {
return;
});
// this.forbiddenDialog = true;
}else if(command == 3){
// this.forbiddenDialog = true;
let params = {
giftIdList: [ item.giftId ],
type: 3
};
this.$confirm('<div>确认启用?</div>', '提示', {
closeOnClickModal: false,
showClose: false,
type: 'warning',
customClass: 'show-title',
dangerouslyUseHTMLString: true,
confirmButtonText: '启用',
showCancelButton: false
}).then(() =>{
this.batchRequest(params);
}).catch(() => {
return;
});
}
},
// 排序
......
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