Skip to content

W
welfare
Commit d1969c1a by 黑潮
Options

update: 优化

parent 50549fee
Showing with 37 additions and 29 deletions
dist/css/chunk-2ecce8fb.e523f06b.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-a3970ba0]{border-color:#1890ff}.upload-ele .el-button[data-v-a3970ba0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a3970ba0]{padding:0}.uploadText p[data-v-a3970ba0]{line-height:26px}.upload-tip-text[data-v-a3970ba0]{font-size:12px;color:#303133}.pickup-upload[data-v-a3970ba0]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-a3970ba0]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-a3970ba0]{font-size:14px}.pickup-upload .pickup-list[data-v-a3970ba0]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a3970ba0]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a3970ba0]{font-size:14px}.w360[data-v-073e8f00]{width:360px}.w-160[data-v-073e8f00]{width:160px}.w140[data-v-073e8f00]{width:140px}.w350[data-v-073e8f00]{width:350px}.mr4[data-v-073e8f00]{margin-right:4px}.tab-top[data-v-073e8f00]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-073e8f00],.tab-top[data-v-073e8f00]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-073e8f00]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-073e8f00]{height:60px}.table-content .img-text img[data-v-073e8f00]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-073e8f00]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-073e8f00]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-073e8f00]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-073e8f00]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-073e8f00]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-073e8f00]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-073e8f00]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-073e8f00]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-073e8f00]:hover{color:#2f54ed}.undeline-dash[data-v-073e8f00]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-073e8f00]{display:inline-block;line-height:32px}.hidden-data[data-v-073e8f00]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-32e43c32.5b41e75b.css deleted 100644 → 0
.ml8[data-v-5f8a1d3e]{margin-left:8px}.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}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-187682c3]{width:360px}.w-160[data-v-187682c3]{width:160px}.w140[data-v-187682c3]{width:140px}.w350[data-v-187682c3]{width:350px}.mr4[data-v-187682c3]{margin-right:4px}.tab-top[data-v-187682c3]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-187682c3],.tab-top[data-v-187682c3]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-187682c3]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-187682c3]{height:60px}.table-content .img-text img[data-v-187682c3]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-187682c3]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-187682c3]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-187682c3]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-187682c3]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-187682c3]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-187682c3]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-187682c3]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-187682c3]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-187682c3]:hover{color:#2f54ed}.undeline-dash[data-v-187682c3]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-187682c3]{display:inline-block;line-height:32px}.hidden-data[data-v-187682c3]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-66c01b24.c8810bfc.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-a3970ba0]{border-color:#1890ff}.upload-ele .el-button[data-v-a3970ba0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a3970ba0]{padding:0}.uploadText p[data-v-a3970ba0]{line-height:26px}.upload-tip-text[data-v-a3970ba0]{font-size:12px;color:#303133}.pickup-upload[data-v-a3970ba0]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-a3970ba0]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-a3970ba0]{font-size:14px}.pickup-upload .pickup-list[data-v-a3970ba0]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a3970ba0]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a3970ba0]{font-size:14px}.w360[data-v-59979645]{width:360px}.w-160[data-v-59979645]{width:160px}.w140[data-v-59979645]{width:140px}.w350[data-v-59979645]{width:350px}.mr4[data-v-59979645]{margin-right:4px}.tab-top[data-v-59979645]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-59979645],.tab-top[data-v-59979645]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-59979645]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-59979645]{height:60px}.table-content .img-text img[data-v-59979645]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-59979645]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-59979645]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-59979645]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-59979645]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-59979645]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-59979645]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-59979645]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-59979645]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-59979645]:hover{color:#2f54ed}.undeline-dash[data-v-59979645]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-59979645]{display:inline-block;line-height:32px}.hidden-data[data-v-59979645]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/css/chunk-6dc8dbce.35eba226.css 0 → 100644
.ml8[data-v-5f8a1d3e]{margin-left:8px}.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}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-985bdfd8]{width:360px}.w-160[data-v-985bdfd8]{width:160px}.w140[data-v-985bdfd8]{width:140px}.w350[data-v-985bdfd8]{width:350px}.mr4[data-v-985bdfd8]{margin-right:4px}.tab-top[data-v-985bdfd8]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-985bdfd8],.tab-top[data-v-985bdfd8]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-985bdfd8]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-985bdfd8]{height:60px}.table-content .img-text img[data-v-985bdfd8]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-985bdfd8]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-985bdfd8]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-985bdfd8]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-985bdfd8]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-985bdfd8]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-985bdfd8]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-985bdfd8]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-985bdfd8]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-985bdfd8]:hover{color:#2f54ed}.undeline-dash[data-v-985bdfd8]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-985bdfd8]{display:inline-block;line-height:32px}.hidden-data[data-v-985bdfd8]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file
dist/js/chunk-5cde1da8.f40747ac.js → dist/js/chunk-5cde1da8.288555f8.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.4a0b36ab.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.be22c79d.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/utils/request.js
......@@ -28,22 +28,22 @@ import { SUCCESS_CODE, origin } from '@/config';
* http状态码处理
* @param {*} code ui目前只处理如下code
*/
function handlerErr(code) {
if (process.env['NODE_ENV'] === 'development') { // eslint-disable-line
return;
}
switch (code) {
case 404:
window.location.href = origin + '/damo-system/404';
break;
case 403:
window.location.href = origin + '/damo-system/403';
break;
case 500:
window.location.href = origin + '/damo-system/500';
break;
}
}
// function handlerErr(code) {
// if (process.env['NODE_ENV'] === 'development') { // eslint-disable-line
// return;
// }
// switch (code) {
// case 404:
// window.location.href = origin + '/damo-system/404';
// break;
// case 403:
// window.location.href = origin + '/damo-system/403';
// break;
// case 500:
// window.location.href = origin + '/damo-system/500';
// break;
// }
// }
axios.defaults.baseURL = origin;
const request = (opt, params, restObj) => {
......@@ -144,9 +144,9 @@ const request = (opt, params, restObj) => {
}
resolve(resp);
}).catch(error => {
if (error) {
handlerErr(error.response.status);
}
// if (error) {
// handlerErr(error.response.status);
// }
Message({
message: (error.response.data.message || '数据加载失败').slice(0, 300),
type: 'warning'
......
src/views/gift-manage/real-gift.vue
......@@ -98,7 +98,9 @@
<p class="stock-box">
<span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
<span v-else>{{ scope.row.minCostPrice.toFixed(2) }}-{{ scope.row.maxCostPrice.toFixed(2) }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整成本" placement="top" open-delay="200">
<i class="el-icon-edit-outline inline-block ml5" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</template>
</el-table-column>
......@@ -125,7 +127,9 @@
<i class="el-icon-question inline-block mr4" slot="reference" style="color:#909399"></i>
</el-popover>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整库存" placement="top" open-delay="200">
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</div>
</template>
......
src/views/gift-manage/sales-return-setting.vue
<template>
<div class="p20" v-loading="loading">
<div class="p20 pt30" v-loading="loading">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" style="min-height:400px;">
<el-form-item label="收货自动加库存" prop="backStockFlag">
<el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.backStockFlag"></el-switch>
<div class="gray03 fz12">开启表示在退货单同意收货后，福利中心可占库存将会增加</div>
</el-form-item>
<el-form-item>
<el-form-item class="mt50">
<el-button type="primary" @click="submitForm">保存</el-button>
<span class="ml10 gray02" v-if="ruleForm.updateTime">最近修改：{{formatDateTimeByType(ruleForm.updateTime, 'yyyy-MM-dd HH:mm:ss')}}</span>
</el-form-item>
......
src/views/gift-manage/virtual-gift.vue
......@@ -98,7 +98,9 @@
<p class="stock-box">
<span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
<span v-else>{{ scope.row.minCostPrice.toFixed(2) }}-{{ scope.row.maxCostPrice.toFixed(2) }}</span>
<i class="el-icon-edit-outline" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整成本" placement="top" open-delay="200">
<i class="el-icon-edit-outline" @click="updateCost(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</template>
</el-table-column>
......@@ -125,7 +127,9 @@
<i class="el-icon-question inline-block mr4" slot="reference" style="color:#909399"></i>
</el-popover>
<span>可占库存：{{ scope.row.remainedStock }}</span>
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
<el-tooltip content="调整库存" placement="top" open-delay="200">
<i class="el-icon-edit-outline inline-block ml5" @click="updateStock(scope.row)" v-if="scope.row.edit==1"></i>
</el-tooltip>
</p>
</div>
</template>
......
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