Skip to content

W
welfare
Commit 2f265311 by 萱草
Options

update: bug修复

parent 93923dab
Showing with 12 additions and 12 deletions
dist/css/chunk-712b2f5b.8881da3b.css → dist/css/chunk-1006d6d9.76456cba.css
.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}.w360[data-v-f84bbf9a]{width:360px}.w-160[data-v-f84bbf9a]{width:160px}.w140[data-v-f84bbf9a]{width:140px}.w350[data-v-f84bbf9a]{width:350px}.tab-top[data-v-f84bbf9a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-f84bbf9a],.tab-top[data-v-f84bbf9a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-f84bbf9a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-f84bbf9a]{height:60px}.table-content .img-text img[data-v-f84bbf9a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-f84bbf9a]{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-f84bbf9a]{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-f84bbf9a]{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-f84bbf9a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-f84bbf9a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-f84bbf9a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-f84bbf9a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-f84bbf9a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-f84bbf9a]:hover{color:#2f54ed}.undeline-dash[data-v-f84bbf9a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-f84bbf9a]{display:inline-block;line-height:32px}.hidden-data[data-v-f84bbf9a]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.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-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-f84bbf9a]{width:360px}.w-160[data-v-f84bbf9a]{width:160px}.w140[data-v-f84bbf9a]{width:140px}.w350[data-v-f84bbf9a]{width:350px}.tab-top[data-v-f84bbf9a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-f84bbf9a],.tab-top[data-v-f84bbf9a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-f84bbf9a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-f84bbf9a]{height:60px}.table-content .img-text img[data-v-f84bbf9a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-f84bbf9a]{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-f84bbf9a]{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-f84bbf9a]{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-f84bbf9a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-f84bbf9a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-f84bbf9a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-f84bbf9a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-f84bbf9a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-f84bbf9a]:hover{color:#2f54ed}.undeline-dash[data-v-f84bbf9a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-f84bbf9a]{display:inline-block;line-height:32px}.hidden-data[data-v-f84bbf9a]{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-14ee1b04.6cbaa722.css 0 → 100644
.step-text[data-v-7af688a6]{color:#000;font-size:14px}.dash-style[data-v-7af688a6]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-7af688a6]{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-7af688a6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-7af688a6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-7af688a6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-7af688a6]{padding:0}.w-630[data-v-7af688a6]{width:630px}.mb56[data-v-7af688a6]{margin-bottom:56px}.from-content[data-v-7af688a6]{position:relative}.from-content .demo-ruleForm .form-section[data-v-7af688a6]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-7af688a6]{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-7af688a6]: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-7af688a6]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-7af688a6]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-7af688a6]{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-7af688a6]{margin-top:12px}.from-content .anchor-link[data-v-7af688a6]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-7af688a6]{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-7af688a6]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-7af688a6]:hover{color:#2f54ed}.ml20[data-v-7af688a6]{margin-left:20px}.mr10[data-v-7af688a6]{margin-right:10px}.tips-content[data-v-7af688a6]{position:absolute;left:-4px;top:6px}.store-tips[data-v-7af688a6]{width:200px;position:absolute;left:-10px}.underline[data-v-7af688a6]{text-decoration:underline}.pickup-upload[data-v-7af688a6]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7af688a6]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7af688a6]{font-size:14px}.pickup-upload .pickup-list[data-v-7af688a6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7af688a6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7af688a6]{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-2e86f609.3b011a8f.css deleted 100644 → 0
.step-text[data-v-2f60b729]{color:#000;font-size:14px}.dash-style[data-v-2f60b729]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-2f60b729]{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-2f60b729]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-2f60b729]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-2f60b729]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-2f60b729]{padding:0}.w-630[data-v-2f60b729]{width:630px}.mb56[data-v-2f60b729]{margin-bottom:56px}.from-content[data-v-2f60b729]{position:relative}.from-content .demo-ruleForm .form-section[data-v-2f60b729]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-2f60b729]{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-2f60b729]: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-2f60b729]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-2f60b729]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-2f60b729]{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-2f60b729]{margin-top:12px}.from-content .anchor-link[data-v-2f60b729]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-2f60b729]{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-2f60b729]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-2f60b729]:hover{color:#2f54ed}.ml20[data-v-2f60b729]{margin-left:20px}.mr10[data-v-2f60b729]{margin-right:10px}.tips-content[data-v-2f60b729]{position:absolute;left:-4px;top:6px}.store-tips[data-v-2f60b729]{width:200px;position:absolute;left:-10px}.underline[data-v-2f60b729]{text-decoration:underline}.pickup-upload[data-v-2f60b729]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-2f60b729]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-2f60b729]{font-size:14px}.pickup-upload .pickup-list[data-v-2f60b729]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-2f60b729]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-2f60b729]{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
src/views/gift-manage/module/select-pickup-store.vue
......@@ -80,7 +80,7 @@
</p>
<p class="pickup-list-total">
成功<span class="pickup-list-success">{{ uploadFile.successNum || 0 }}</span>个，失败<span class="pickup-list-error">{{ uploadFile.errorNum || 0 }}</span>个。
<el-button type="text" @click="showErrorList = true">查看失败原因</el-button>
<el-button type="text" v-if="uploadFile.errorNum" @click="showErrorList = true">查看失败原因</el-button>
</p>
</div>
</div>
......
src/views/gift-manage/module/update-virtual-stock.vue
......@@ -6,7 +6,7 @@
<div class="pickup-upload">
<div>
<span class="file-style inline-block" style="position:relative">
<input style="position:absolute;top:3px;opacity:0;" type="file" name="file" accept=".xlsx,.xls" ref="file" @change="change">
<input style="position:absolute;top:3px;opacity:0;width:70px" type="file" name="file" accept=".xlsx,.xls" ref="file" @change="change">
<el-button class="upload-trigger" @click="upload"><i class="iconfont-components4 icon-cp-shangc upload-icon"></i> 上传</el-button>
</span>
<span class="upload-tip inline-block">
......
src/views/gift-manage/real-gift-detail.vue
......@@ -184,7 +184,7 @@
<dm-input-amount v-model="goodsForm.costPrice" width="180" :min="0" :max="999999.99" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-amount>
</el-form-item>
<el-form-item label="可占用库存" class="w-630" prop="stock">
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-number>
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="0" :disabled="goodsStandardInfo.length > 0"></dm-input-number>
</el-form-item>
<el-form-item prop="marketPrice" label="市场价:">
<dm-input-amount v-model="goodsForm.marketPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
......@@ -214,7 +214,7 @@
</el-checkbox-group>
</template>
</el-form-item>
<el-form-item label="设置自提点" v-if="goodsForm.deliveryType == 2">
<el-form-item label="设置自提点" v-if="goodsForm.deliveryType == 2 || goodsForm.deliveryList.length == 2">
<template>
<select-pickup-store :gift-id="giftId" :is-edit="isEdit" :data="diliveryData" @change="changeStoreSelect"></select-pickup-store>
</template>
......@@ -556,7 +556,7 @@ export default {
this.goodsForm.giftBarNo = resResult.giftBarNo; // 礼品条形码
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '2' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '0' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.deliveryType = resResult.deliveryType;
if(this.goodsForm.deliveryType == '1,2'){
this.goodsForm.deliveryList = [ '1', '2' ];
......@@ -1431,7 +1431,7 @@ export default {
};
this.btnLoading = true;
console.log(params);
console.log(skuList);
// console.log(skuList);
if (this.isEdit) {
// params.giftId = this.giftId;
giftUpdate(params).then(res =>{
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -26,7 +26,7 @@
<dm-input-amount v-model="goodsForm.virCostPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
</el-form-item>
<el-form-item label="库存" class="w-630" prop="stock">
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" disabled placeholder="上传文件后自动填充"></dm-input-number>
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="0" disabled placeholder="上传文件后自动填充"></dm-input-number>
</el-form-item>
<el-form-item prop="marketPrice" label="市场价">
<dm-input-amount v-model="goodsForm.marketPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
......@@ -511,7 +511,7 @@ export default {
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
// this.goodsForm.shopCodeList = resResult.shopId; // 操作人权限code
this.goodsForm.template = resResult.template; // 虚拟礼品模板
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '2' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '0' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.deliveryType = resResult.deliveryType;
this.goodsForm.giftImages = resResult.giftImages;
this.goodsForm.stockUseType = resResult.stockUseType;
......
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