Skip to content

W
welfare
Commit 58b0cd89 by 萱草
Options

update: bug修复

parent 3c5eb09d
Showing with 42 additions and 21 deletions
dist/css/chunk-5ed58741.c94169a0.css deleted 100644 → 0
.step-text[data-v-59c95538]{color:#000;font-size:14px}.dash-style[data-v-59c95538]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-59c95538]{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-59c95538]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-59c95538]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-59c95538]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-59c95538]{padding:0}.w-630[data-v-59c95538]{width:630px}.mb56[data-v-59c95538]{margin-bottom:56px}.from-content[data-v-59c95538]{position:relative}.from-content .demo-ruleForm .form-section[data-v-59c95538]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-59c95538]{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-59c95538]: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-59c95538]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-59c95538]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-59c95538]{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-59c95538]{margin-top:12px}.from-content .anchor-link[data-v-59c95538]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-59c95538]{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-59c95538]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-59c95538]:hover{color:#2f54ed}.ml20[data-v-59c95538]{margin-left:20px}.mr10[data-v-59c95538]{margin-right:10px}.tips-content[data-v-59c95538]{position:absolute;left:-4px;top:6px}.store-tips[data-v-59c95538]{width:200px;position:absolute;left:-10px}.underline[data-v-59c95538]{text-decoration:underline}.pickup-upload[data-v-59c95538]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-59c95538]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-59c95538]{font-size:14px}.pickup-upload .pickup-list[data-v-59c95538]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-59c95538]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-59c95538]{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-9e7ba7ac.e2d1f57b.css 0 → 100644
.step-text[data-v-b6d548a4]{color:#000;font-size:14px}.dash-style[data-v-b6d548a4]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-b6d548a4]{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-b6d548a4]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-b6d548a4]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-b6d548a4]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-b6d548a4]{padding:0}.w-630[data-v-b6d548a4]{width:630px}.mb56[data-v-b6d548a4]{margin-bottom:56px}.from-content[data-v-b6d548a4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-b6d548a4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-b6d548a4]{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-b6d548a4]: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-b6d548a4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-b6d548a4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-b6d548a4]{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-b6d548a4]{margin-top:12px}.from-content .anchor-link[data-v-b6d548a4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-b6d548a4]{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-b6d548a4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-b6d548a4]:hover{color:#2f54ed}.ml20[data-v-b6d548a4]{margin-left:20px}.mr10[data-v-b6d548a4]{margin-right:10px}.tips-content[data-v-b6d548a4]{position:absolute;left:-4px;top:6px}.store-tips[data-v-b6d548a4]{width:200px;position:absolute;left:-10px}.underline[data-v-b6d548a4]{text-decoration:underline}.pickup-upload[data-v-b6d548a4]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-b6d548a4]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-b6d548a4]{font-size:14px}.pickup-upload .pickup-list[data-v-b6d548a4]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-b6d548a4]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-b6d548a4]{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/js/chunk-34bff564.5c41d86f.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-34bff564.d2801cb5.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-6287d3af.e3fbaa92.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";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",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"}},exportPickup:"/export-pickup-store-excel"};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"],o["c"].api,o["f"]},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.fa4fbc54.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";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",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"}},exportPickup:"/export-pickup-store-excel"};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"],o["c"].api,o["f"]},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
src/api/gift.js
...@@ -83,7 +83,7 @@ let setting = { ...@@ -83,7 +83,7 @@ let setting = {
}, },
getConfigDetail: '/config/get-config-detail', getConfigDetail: '/config/get-config-detail',
getAddressList: '/address/get-address-list', getAddressList: '/address/get-address-list',
getAddressDetails: 'address/get-address-details', getAddressDetails: '/address/get-address-details',
delAddress: '/address/del-address', delAddress: '/address/del-address',
insertOrUpdateAddress: { // 新增或修改退货地址 insertOrUpdateAddress: { // 新增或修改退货地址
url: '/address/insert-or-update-address', url: '/address/insert-or-update-address',
......
src/components/stock-list/welfare-item.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<!-- 实物礼品才有sku列表 --> <!-- 实物礼品才有sku列表 -->
<el-table :data="skuList" v-if="type == 1" style="width: calc(100% - 40px)" max-height="200" class="ml20 mr20 mb10 el-table-list-mini-empty"> <el-table :data="skuList" v-if="type == 1 && goodsStandardInfo.length > 0" style="width: calc(100% - 40px)" max-height="200" class="ml20 mr20 mb10 el-table-list-mini-empty">
<el-table-column prop="giftSkuName" label="SKU信息" min-width="180" show-overflow-tooltip> <el-table-column prop="giftSkuName" label="SKU信息" min-width="180" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display:flex;align-items:center;"> <div style="display:flex;align-items:center;">
...@@ -73,7 +73,8 @@ export default { ...@@ -73,7 +73,8 @@ export default {
return { return {
info: {}, info: {},
dialogVisible: false, dialogVisible: false,
skuList: [] skuList: [],
goodsStandardInfo: []
}; };
}, },
methods: { methods: {
...@@ -99,6 +100,7 @@ export default { ...@@ -99,6 +100,7 @@ export default {
}; };
if(this.type == 1) { if(this.type == 1) {
this.skuList = res.result.skuList || []; this.skuList = res.result.skuList || [];
this.goodsStandardInfo = res.result.giftSpecInfo ? JSON.parse(res.result.giftSpecInfo) : []; // 礼品规格信息
this.$emit('updateSkulist', this.skuList); this.$emit('updateSkulist', this.skuList);
} }
}); });
......
src/router/other.js
...@@ -35,7 +35,7 @@ export default [ ...@@ -35,7 +35,7 @@ export default [
component: () => import('@/views/gift-manage/address-lib-form.vue'), component: () => import('@/views/gift-manage/address-lib-form.vue'),
meta: { meta: {
type: 'add', type: 'add',
path: '/settinge/address-lib-list' path: '/setting/address-lib-list'
} }
}, },
{ {
...@@ -43,7 +43,7 @@ export default [ ...@@ -43,7 +43,7 @@ export default [
component: () => import('@/views/gift-manage/address-lib-form.vue'), component: () => import('@/views/gift-manage/address-lib-form.vue'),
meta: { meta: {
type: 'edit', type: 'edit',
path: '/settinge/address-lib-list' path: '/setting/address-lib-list'
} }
}, },
{ {
......
src/views/gift-manage/module/update-real-cost.vue
...@@ -137,7 +137,7 @@ export default { ...@@ -137,7 +137,7 @@ export default {
} }
this.goodsStandardInfo = this.giftSpecInfo ? JSON.parse(this.giftSpecInfo) : []; // 礼品规格信息 this.goodsStandardInfo = this.giftSpecInfo ? JSON.parse(this.giftSpecInfo) : []; // 礼品规格信息
if(this.goodsStandardInfo.length === 0){ if(this.goodsStandardInfo.length === 0){
this.costPrice = res.result.costPrice.toFixed(2); this.costPrice = Number(res.result.costPrice).toFixed(2);
} }
if (this.goodsStandardInfo.length > 0) { if (this.goodsStandardInfo.length > 0) {
this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false; this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
...@@ -208,7 +208,7 @@ export default { ...@@ -208,7 +208,7 @@ export default {
for (let item of goodsSkuListCopy) { for (let item of goodsSkuListCopy) {
if (skuSellObjCopy[item.mapId]) { if (skuSellObjCopy[item.mapId]) {
this.skuSellObj[item.mapId] = { this.skuSellObj[item.mapId] = {
giftSkuCostPrice: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCostPrice.toFixed(2) : '', giftSkuCostPrice: (Object.keys(skuSellObjCopy).length > 0 && skuSellObjCopy[item.mapId].giftSkuCostPrice) ? Number(skuSellObjCopy[item.mapId].giftSkuCostPrice).toFixed(2) : '',
stock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '', stock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '',
giftSkuCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCode : '', giftSkuCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCode : '',
skuBarCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].skuBarCode : '', skuBarCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].skuBarCode : '',
......
src/views/gift-manage/module/update-real-stock.vue
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</el-popover> </el-popover>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px" @change="changeType"> <el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px" @change="changeSingleStock(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].stageStock, skuSellObj[scope.row.mapId].stockType)">
<el-option label="增加" :value="1"></el-option> <el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option> <el-option label="减少" :value="0"></el-option>
</el-select> </el-select>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<el-form class="mt20" v-else> <el-form class="mt20" v-else>
<el-form-item label="可占库存" required> <el-form-item label="可占库存" required>
<template> <template>
<el-select v-model="stockType" style="width:100px;"> <el-select v-model="stockType" style="width:100px;" @change="changeSingleStock(giftSkuId, stock, stockType)">
<el-option label="增加" :value="1"></el-option> <el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option> <el-option label="减少" :value="0"></el-option>
</el-select> </el-select>
...@@ -174,6 +174,7 @@ export default { ...@@ -174,6 +174,7 @@ export default {
}, },
changeType(value){ changeType(value){
console.log(value); console.log(value);
this.changeSingleStock();
}, },
submitProNanme() { submitProNanme() {
if(this.loading) return; if(this.loading) return;
......
src/views/gift-manage/pickup-list.vue
...@@ -110,12 +110,21 @@ export default { ...@@ -110,12 +110,21 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
refresh(value){
this.listParams.name = value;
this.getTableList();
},
getTableList() { getTableList() {
if(this.loading) { if(this.loading) {
return; return;
} }
this.loading = true; this.loading = true;
pickupList().then(res => { let params = {
name: this.listParams.name,
currentPage: this.listParams.currentPage,
pageSize: this.listParams.pageSize,
};
pickupList(params).then(res => {
this.loading = false; this.loading = false;
const data = res.result; const data = res.result;
this.tableList = data.result || []; this.tableList = data.result || [];
......
src/views/gift-manage/real-gift-detail.vue
...@@ -257,8 +257,10 @@ ...@@ -257,8 +257,10 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="fixed-btn"> <div class="fixed-btn">
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</dm-perm-button> <el-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</el-button>
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</dm-perm-button> <el-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</el-button>
<!-- <dm-perm-button type="primary" @click="submitForm('goodsForm')" v-if="isEdit">保存</dm-perm-button>
<dm-perm-button type="primary" @click="submitForm('goodsForm')" v-else>确认新建</dm-perm-button> -->
</div> </div>
</el-form> </el-form>
</div> </div>
...@@ -595,7 +597,7 @@ export default { ...@@ -595,7 +597,7 @@ export default {
this.goodsForm.costPrice = skuList[0].giftSkuCostPrice; this.goodsForm.costPrice = skuList[0].giftSkuCostPrice;
} }
}else{ }else{
this.goodsForm.costPrice = resResult.costPrice; this.goodsForm.costPrice = Number(resResult.costPrice).toFixed(2);
} }
let mapData = []; let mapData = [];
let skuSellObj = {}; let skuSellObj = {};
...@@ -772,6 +774,9 @@ export default { ...@@ -772,6 +774,9 @@ export default {
// 删除规格 // 删除规格
deleteSku(index) { deleteSku(index) {
this.goodsStandardInfo.splice(index, 1); this.goodsStandardInfo.splice(index, 1);
// if(!this.goodsStandardInfo.length){
this.goodsForm.costPrice = '';
// };
this.getSkuList(); this.getSkuList();
}, },
...@@ -890,6 +895,8 @@ export default { ...@@ -890,6 +895,8 @@ export default {
} }
this.goodsSkuList = deepClone(goodsSkuListCopy); this.goodsSkuList = deepClone(goodsSkuListCopy);
this.getSkuList(); this.getSkuList();
this.handleCostPrice();
this.handleStock();
}, },
// 表格里面的图片上传成功 // 表格里面的图片上传成功
tableUploadSuccess(response, file, fileList, item2) { tableUploadSuccess(response, file, fileList, item2) {
...@@ -1024,6 +1031,7 @@ export default { ...@@ -1024,6 +1031,7 @@ export default {
// this.goodsForm.spuList[0].costPrice = min + '~' + max; // this.goodsForm.spuList[0].costPrice = min + '~' + max;
this.goodsForm.costPrice = min + '~' + max; this.goodsForm.costPrice = min + '~' + max;
} }
console.log(this.goodsForm.costPrice);
}else if(arr1.length === 1){ }else if(arr1.length === 1){
for(let key1 in this.skuSellObj){ for(let key1 in this.skuSellObj){
this.goodsForm.costPrice = this.skuSellObj[key1].giftSkuCostPrice; this.goodsForm.costPrice = this.skuSellObj[key1].giftSkuCostPrice;
...@@ -1110,7 +1118,7 @@ export default { ...@@ -1110,7 +1118,7 @@ export default {
this.goodsForm.stock = Number(this.goodsForm.stock) + Number(this.skuSellObj[item].stock); this.goodsForm.stock = Number(this.goodsForm.stock) + Number(this.skuSellObj[item].stock);
} }
// this.goodsForm.spuList[0].costPrice = this.skuSellObj[item].giftSkuCostPrice; // this.goodsForm.spuList[0].costPrice = this.skuSellObj[item].giftSkuCostPrice;
this.goodsForm.costPrice = this.skuSellObj[item].giftSkuCostPrice; // this.goodsForm.costPrice = this.skuSellObj[item].giftSkuCostPrice;
} }
}, },
// 获取sku数据 // 获取sku数据
...@@ -1167,7 +1175,7 @@ export default { ...@@ -1167,7 +1175,7 @@ export default {
for (let item of goodsSkuListCopy) { for (let item of goodsSkuListCopy) {
if (skuSellObjCopy[item.mapId]) { if (skuSellObjCopy[item.mapId]) {
this.skuSellObj[item.mapId] = { this.skuSellObj[item.mapId] = {
giftSkuCostPrice: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCostPrice.toFixed(2) : '', giftSkuCostPrice: (Object.keys(skuSellObjCopy).length > 0 && skuSellObjCopy[item.mapId].giftSkuCostPrice) ? Number(skuSellObjCopy[item.mapId].giftSkuCostPrice).toFixed(2) : '',
stock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '', stock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '',
giftSkuCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCode : '', giftSkuCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCode : '',
skuBarCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].skuBarCode : '', skuBarCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].skuBarCode : '',
...@@ -1410,7 +1418,7 @@ export default { ...@@ -1410,7 +1418,7 @@ export default {
// shopId: '', // 门店id // shopId: '', // 门店id
giftName: this.goodsForm.giftName, // 礼品名称 giftName: this.goodsForm.giftName, // 礼品名称
marketPrice: this.goodsForm.marketPrice, // 市场价 marketPrice: this.goodsForm.marketPrice, // 市场价
costPrice: skuList.length == 0 ? this.goodsForm.costPrice : -1, // 成本价 costPrice: this.goodsStandardInfo.length == 0 ? this.goodsForm.costPrice : -1, // 成本价
stock: this.goodsForm.stock, // 库存 stock: this.goodsForm.stock, // 库存
giftNo: this.goodsForm.giftNo, // 礼品编码 giftNo: this.goodsForm.giftNo, // 礼品编码
giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码 giftBarNo: this.goodsForm.giftBarNo, // 礼品条形码
......
src/views/gift-manage/virtual-gift-detail.vue
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
<p>1.请按照顺序维护表头，所有变量均为必填项;</p> <p>1.请按照顺序维护表头，所有变量均为必填项;</p>
<p>2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p> <p>2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p> <p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
<p>4.正在异步上传处理中，我们将按照顺序分批次（5000/1批次）更新库存，请稍候刷新查看库存上传结果;</p>
</div> </div>
</el-popover> </el-popover>
<el-button type="text" v-if="isEdit" class="inline-block ml20" @click="checkUploadDetail">查看内容</el-button> <el-button type="text" v-if="isEdit" class="inline-block ml20" @click="checkUploadDetail">查看内容</el-button>
...@@ -513,7 +514,7 @@ export default { ...@@ -513,7 +514,7 @@ export default {
this.goodsForm.giftNo = resResult.giftNo; this.goodsForm.giftNo = resResult.giftNo;
this.goodsForm.stock = resResult.stock; this.goodsForm.stock = resResult.stock;
this.goodsForm.giftBarNo = resResult.giftBarNo; this.goodsForm.giftBarNo = resResult.giftBarNo;
this.goodsForm.virCostPrice = resResult.virCostPrice.toFixed(2); this.goodsForm.virCostPrice = Number(resResult.virCostPrice).toFixed(2);
this.goodsForm.marketPrice = resResult.marketPrice; // 市场价 this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限 this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth ? resResult.operAuth.split(',') : []; this.goodsForm.operAuthPre = resResult.operAuth ? resResult.operAuth.split(',') : [];
......
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