Skip to content

W
welfare
Commit e2d91e30 by 萱草
Options

update: 礼品编辑调试

parent 731c39c5
Showing with 40 additions and 24 deletions
dist/css/chunk-1c02b44e.5a3eacb9.css 0 → 100644
.step-text[data-v-368a24f4]{color:#000;font-size:14px}.dash-style[data-v-368a24f4]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-368a24f4]{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-368a24f4]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-368a24f4]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-368a24f4]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-368a24f4]{padding:0}.w-630[data-v-368a24f4]{width:630px}.mb56[data-v-368a24f4]{margin-bottom:56px}.from-content[data-v-368a24f4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-368a24f4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-368a24f4]{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-368a24f4]: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-368a24f4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-368a24f4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-368a24f4]{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-368a24f4]{margin-top:12px}.from-content .anchor-link[data-v-368a24f4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-368a24f4]{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-368a24f4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-368a24f4]:hover{color:#2f54ed}.ml20[data-v-368a24f4]{margin-left:20px}.mr10[data-v-368a24f4]{margin-right:10px}.tips-content[data-v-368a24f4]{position:absolute;left:-4px;top:6px}.store-tips[data-v-368a24f4]{width:200px;position:absolute;left:-10px}.underline[data-v-368a24f4]{text-decoration:underline}.pickup-upload[data-v-368a24f4]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-368a24f4]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-368a24f4]{font-size:14px}.pickup-upload .pickup-list[data-v-368a24f4]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-368a24f4]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-368a24f4]{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
dist/css/chunk-342a4127.2aad20d9.css deleted 100644 → 0
.step-text[data-v-a1c6e794]{color:#000;font-size:14px}.dash-style[data-v-a1c6e794]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-a1c6e794]{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-a1c6e794]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-a1c6e794]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-a1c6e794]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a1c6e794]{padding:0}.w-630[data-v-a1c6e794]{width:630px}.mb56[data-v-a1c6e794]{margin-bottom:56px}.from-content[data-v-a1c6e794]{position:relative}.from-content .demo-ruleForm .form-section[data-v-a1c6e794]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-a1c6e794]{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-a1c6e794]: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-a1c6e794]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-a1c6e794]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-a1c6e794]{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-a1c6e794]{margin-top:12px}.from-content .anchor-link[data-v-a1c6e794]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-a1c6e794]{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-a1c6e794]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-a1c6e794]:hover{color:#2f54ed}.ml20[data-v-a1c6e794]{margin-left:20px}.mr10[data-v-a1c6e794]{margin-right:10px}.tips-content[data-v-a1c6e794]{position:absolute;left:-4px;top:6px}.store-tips[data-v-a1c6e794]{width:200px;position:absolute;left:-10px}.underline[data-v-a1c6e794]{text-decoration:underline}.pickup-upload[data-v-a1c6e794]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-a1c6e794]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-a1c6e794]{font-size:14px}.pickup-upload .pickup-list[data-v-a1c6e794]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a1c6e794]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a1c6e794]{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
src/views/gift-manage/real-gift-detail.vue
......@@ -575,14 +575,14 @@ export default {
this.goodsForm.giftDescrption = resResult.giftDescrption; // 礼品详情
this.goodsForm.refundFlag = resResult.refundFlag; // 是否支持退货
this.goodsStandardInfo = resResult.giftSpecInfo ? JSON.parse(resResult.giftSpecInfo) : []; // 礼品规格信息
if (this.goodsStandardInfo.length > 0) {
this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
} else {
this.isStdImg = false;
}
if (this.goodsStandardInfo.length > 0) {
this.getSkuList();
}
// if (this.goodsStandardInfo.length > 0) {
// this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
// } else {
// this.isStdImg = false;
// }
// if (this.goodsStandardInfo.length > 0) {
// this.getSkuList();
// }
let skuList = resResult.skuList || []; // 礼品规格值信息
if(skuList.length > 1){
......@@ -633,6 +633,14 @@ export default {
}
this.skuSellObj = deepClone(skuSellObj);
}
if (this.goodsStandardInfo.length > 0) {
this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
} else {
this.isStdImg = false;
}
if (this.goodsStandardInfo.length > 0) {
this.getSkuList();
}
} else {
this.$message.error(res.message);
}
......@@ -1051,7 +1059,6 @@ export default {
// 组合sku的销售值信息 价格，库存，sku编码 ，商品条形码
let goodsSkuListCopy = deepClone(goodsSkuList);
let skuSellObjCopy = deepClone(this.skuSellObj);
this.skuSellObj = {};
for (let item of goodsSkuListCopy) {
......@@ -1064,6 +1071,8 @@ export default {
giftSkuId: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuId : '',
stockStatus: true,
giftSkuCostPriceStatus: true,
stockAlter: 0,
stockType: 0
// skuId: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].skuId : ''
};
this.stockObj[item.mapId] = Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '';
......@@ -1075,7 +1084,9 @@ export default {
skuBarCode: '',
stockStatus: true,
giftSkuCostPriceStatus: true,
giftSkuId: ''
giftSkuId: '',
stockAlter: 0,
stockType: 0
// skuId: ''
};
}
......@@ -1167,10 +1178,10 @@ export default {
}
if(this.isEdit){
if(Number(this.stockObj[key]) > Number(this.skuSellObj[key].stock)){
this.skuSellObj[key].stockType = 1;
this.skuSellObj[key].stockType = 0;
this.skuSellObj[key].stockAlter = Number(this.stockObj[key]) - Number(this.skuSellObj[key].stock);
}else{
this.skuSellObj[key].stockType = 0;
this.skuSellObj[key].stockType = 1;
this.skuSellObj[key].stockAlter = Number(this.skuSellObj[key].stock) - Number(this.stockObj[key]);
}
console.log(this.skuSellObj);
......@@ -1232,9 +1243,9 @@ export default {
return item;
});
skuList.push({
// gift: this.giftId,
// giftSkuId: this.skuSellObj[item].stock,
stock: this.skuSellObj[item].stock,
giftId: this.giftId,
giftSkuId: this.skuSellObj[item].giftSkuId,
// stock: this.skuSellObj[item].stock,
giftSkuCode: this.skuSellObj[item].giftSkuCode,
skuBarCode: this.skuSellObj[item].skuBarCode,
giftSkuCostPrice: this.skuSellObj[item].giftSkuCostPrice,
......@@ -1290,10 +1301,14 @@ export default {
// shopId: '', // 门店id
giftName: this.goodsForm.giftName, // 礼品名称
marketPrice: this.goodsForm.marketPrice, // 市场价
costPrice: this.goodsForm.spuList[0].costPrice, // 成本价
stock: this.goodsForm.spuList[0].stock, // 库存
giftNo: this.goodsForm.spuList[0].giftNo, // 礼品编码
giftBarNo: this.goodsForm.spuList[0].giftBarNo, // 礼品条形码
costPrice: this.goodsForm.costPrice, // 成本价
stock: this.goodsForm.stock, // 库存
giftNo: this.goodsForm.giftNo, // 礼品编码
giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码
// costPrice: this.goodsForm.spuList[0].costPrice, // 成本价
// stock: this.goodsForm.spuList[0].stock, // 库存
// giftNo: this.goodsForm.spuList[0].giftNo, // 礼品编码
// giftBarNo: this.goodsForm.spuList[0].giftBarNo, // 礼品条形码
giftImages: this.goodsForm.giftImages, // 礼品主图
giftDescrption: this.goodsForm.giftDescrption, // 礼品详情
refundFlag: this.goodsForm.refundFlag, // 是否支持退货
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -23,7 +23,7 @@
<div class="form-section">
<h3>库存信息</h3>
<el-form-item label="成本" class="w-630" prop="costPrice">
<dm-input-amount v-model="goodsForm.costPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
<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>
......@@ -207,6 +207,7 @@ export default {
goodsForm: {
giftName: '', // 礼品名称
marketPrice: undefined, // 礼品市场价
virCostPrice: undefined,
giftImages: '', // 礼品主图URL，分割
giftDescrption: '', // 礼品详情
checkList: [],
......@@ -231,7 +232,7 @@ export default {
goodsRules: {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
costPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
virCostPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
deliveryType: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ]
......@@ -561,7 +562,7 @@ export default {
giftType: 2, // 虚拟礼品
giftName: this.goodsForm.giftName, // 礼品名称
marketPrice: this.goodsForm.marketPrice, // 市场价
virCostPrice: 0, // 虚拟礼品成本价
virCostPrice: this.goodsForm.virCostPrice, // 虚拟礼品成本价
stock: 0, // 库存
giftNo: this.goodsForm.giftNo, // 礼品编码
giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码
......
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