Skip to content

W
welfare
Commit c22d7395 by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/app.4ffa8d54.js
#	dist/js/card-package.6d2b680e.js
#	dist/js/chunk-0d4ebdfa.6e24cbce.js
#	dist/js/chunk-331988dc.5501d5e7.js
#	dist/js/chunk-331988dc.93b07338.js
#	dist/js/chunk-331988dc.dce5d678.js
#	dist/js/chunk-342a4127.7ea4ab56.js
#	dist/js/chunk-34bff564.ee9995d3.js
#	dist/js/chunk-36f40ade.49385487.js
#	dist/js/chunk-36f40ade.55612e17.js
#	dist/js/chunk-36f40ade.e16bdf31.js
#	dist/js/chunk-4fc0e81c.b6567938.js
#	dist/js/chunk-6287d3af.93237782.js
#	dist/js/chunk-7a226a22.38a77037.js
#	dist/js/chunk-7eb10ad4.5cb38e77.js
#	dist/js/chunk-7eb10ad4.a0691e37.js
#	dist/js/chunk-7eb10ad4.ea414a2a.js
#	dist/js/chunk-ad95361e.598a10db.js
#	dist/js/chunk-edf46648.1a2c97a9.js
#	dist/js/chunk-edf46648.7e31fa28.js
#	dist/js/chunk-edf46648.f9e04205.js
#	dist/js/chunk-f95812e2.a9ff509c.js
#	dist/js/gic-card.781a1f09.js
parents ab509ac5 e2d91e30
Showing with 42 additions and 26 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
dist/js/chunk-34bff564.87189dbd.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-34bff564.9897848f.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-6287d3af.167221e6.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return n}));a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function p(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var c={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",virtualUploadLog:{url:"/gift/vir-card-log-page",method:"post"},batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};c=Object(i["a"])(c,o["f"]),l=Object(i["a"])(l,o["f"]),e["a"]=p(p({},c),l);o["c"].api,o["b"];var n=o["c"].api+o["f"]+"/export-pickup-store-excel"},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),p=a("cdc8");function c(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function l(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?c(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):c(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var n=p["a"].updateConfig,d=p["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,n({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=l(l({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file
dist/js/chunk-6287d3af.5791e24e.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return l}));a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function c(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",virtualUploadLog:{url:"/gift/vir-card-log-page",method:"post"},batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"application/x-www-form-urlencoded"}},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},n={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};p=Object(i["a"])(p,o["f"]),n=Object(i["a"])(n,o["f"]),e["a"]=c(c({},p),n);o["c"].api,o["b"];var l=o["c"].api+o["f"]+"/export-pickup-store-excel"},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),c=a("cdc8");function p(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?p(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):p(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var l=c["a"].updateConfig,d=c["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,l({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=n(n({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ 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