Skip to content

W
welfare
Commit 9eb38728 by 萱草
Options

update: 更改

parent e1fa1786
Showing with 6 additions and 5 deletions
dist/css/chunk-4275b00a.6c8e46f5.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-554c14f5]{width:360px}.w-160[data-v-554c14f5]{width:160px}.w140[data-v-554c14f5]{width:140px}.w350[data-v-554c14f5]{width:350px}.tab-top[data-v-554c14f5]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-554c14f5],.tab-top[data-v-554c14f5]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-554c14f5]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-554c14f5]{height:60px}.table-content .img-text img[data-v-554c14f5]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-554c14f5]{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-554c14f5]{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-554c14f5]{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-554c14f5]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-554c14f5]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-554c14f5]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-554c14f5]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-554c14f5]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-554c14f5]:hover{color:#2f54ed}.undeline-dash[data-v-554c14f5]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-554c14f5]{display:inline-block;line-height:32px}.hidden-data[data-v-554c14f5]{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-5bfafd3a.ca0cb1ae.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-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-cb967474]{width:360px}.w-160[data-v-cb967474]{width:160px}.w140[data-v-cb967474]{width:140px}.w350[data-v-cb967474]{width:350px}.tab-top[data-v-cb967474]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-cb967474],.tab-top[data-v-cb967474]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-cb967474]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-cb967474]{height:60px}.table-content .img-text img[data-v-cb967474]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-cb967474]{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-cb967474]{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-cb967474]{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-cb967474]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-cb967474]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-cb967474]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-cb967474]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-cb967474]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-cb967474]:hover{color:#2f54ed}.undeline-dash[data-v-cb967474]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-cb967474]{display:inline-block;line-height:32px}.hidden-data[data-v-cb967474]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
src/views/gift-manage/virtual-gift.vue
......@@ -98,7 +98,7 @@
</p>
</template>
</el-table-column>
<el-table-column sortable="custom" label="库存" min-width="150px">
<el-table-column sortable="custom" prop="stock" label="库存" min-width="150px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">可占用库存</span>
......@@ -126,7 +126,7 @@
</div>
</template>
</el-table-column>
<el-table-column prop="allExchangeNumber" label="总出库量" sortable="custom" min-width="100px">
<el-table-column prop="allExchangeNumber" label="总出库量" min-width="100px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">总出库量</span>
......@@ -421,8 +421,9 @@ export default {
} else if (value.prop === 'costPrice' && value.order == 'descending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'stock') {
this.query.sortColumn = 'stock';
this.query.sortColumn = 'remained_stock';
}
console.log(value.prop, this.query.sortOrder, this.query.sortColumn);
this.getTableList();
},
changeTime(){
......
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