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

# Conflicts:
#	dist/index.html
#	dist/js/app.9491ada1.js
#	dist/js/chunk-0d4ebdfa.10e08b86.js
#	dist/js/chunk-0d4ebdfa.451811ba.js
#	dist/js/chunk-0d4ebdfa.f3163d80.js
#	dist/js/chunk-19510fda.8acff3bb.js
#	dist/js/chunk-1c02b44e.0867831a.js
#	dist/js/chunk-28cb370c.61f53ccc.js
#	dist/js/chunk-34bff564.ddde5d4d.js
#	dist/js/chunk-40634738.68f48390.js
#	dist/js/chunk-40634738.747db852.js
#	dist/js/chunk-40634738.acdd7121.js
#	dist/js/chunk-4fc0e81c.d388e2fd.js
#	dist/js/chunk-6287d3af.47d9377c.js
#	dist/js/chunk-7a226a22.3d1ead70.js
#	dist/js/chunk-edf46648.da189466.js

dist/css/chunk-05d67f18.9bcfd1b2.css

+.tab-top[data-v-2ec87d6f]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-2ec87d6f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-2ec87d6f]{height:60px}.table-content .img-text img[data-v-2ec87d6f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-2ec87d6f]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-2ec87d6f]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-2ec87d6f]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-2ec87d6f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-2ec87d6f]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-2ec87d6f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-2ec87d6f]:hover{color:#2f54ed}.undeline-dash[data-v-2ec87d6f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-2ec87d6f]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file

dist/css/chunk-1c02b44e.5a3eacb9.css

-.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-2b9b8092.f18d7179.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}.tab-top[data-v-db14d510]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-db14d510],.tab-top[data-v-db14d510]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-db14d510]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-db14d510]{height:60px}.table-content .img-text img[data-v-db14d510]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-db14d510]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-db14d510]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-db14d510]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-db14d510]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-db14d510]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-db14d510]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-db14d510]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-db14d510]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-db14d510]:hover{color:#2f54ed}.undeline-dash[data-v-db14d510]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-db14d510]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/css/chunk-4fc0e81c.73b4280c.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}.upload-btn[data-v-7e5d0c2d]{height:32px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:20px;width:84px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-7e5d0c2d]{font-size:14px;color:#c0c4cc}.upload-btn[data-v-7e5d0c2d]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-7e5d0c2d]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-7e5d0c2d]{padding:0}.uploadText p[data-v-7e5d0c2d]{line-height:26px}.pickup-upload[data-v-7e5d0c2d]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7e5d0c2d]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7e5d0c2d]{font-size:14px}.pickup-upload .pickup-list[data-v-7e5d0c2d]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7e5d0c2d]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7e5d0c2d]{font-size:14px}.tab-top[data-v-c65cbe5a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-c65cbe5a],.tab-top[data-v-c65cbe5a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-c65cbe5a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-c65cbe5a]{height:60px}.table-content .img-text img[data-v-c65cbe5a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-c65cbe5a]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-c65cbe5a]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-c65cbe5a]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-c65cbe5a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-c65cbe5a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-c65cbe5a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-c65cbe5a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-c65cbe5a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-c65cbe5a]:hover{color:#2f54ed}.undeline-dash[data-v-c65cbe5a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-c65cbe5a]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file

dist/css/chunk-8d5fa8a2.ea225a10.css

+.step-text[data-v-720c1d46]{color:#000;font-size:14px}.dash-style[data-v-720c1d46]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-720c1d46]{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-720c1d46]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-720c1d46]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-720c1d46]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-720c1d46]{padding:0}.w-630[data-v-720c1d46]{width:630px}.mb56[data-v-720c1d46]{margin-bottom:56px}.from-content[data-v-720c1d46]{position:relative}.from-content .demo-ruleForm .form-section[data-v-720c1d46]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-720c1d46]{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-720c1d46]: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-720c1d46]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-720c1d46]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-720c1d46]{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-720c1d46]{margin-top:12px}.from-content .anchor-link[data-v-720c1d46]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-720c1d46]{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-720c1d46]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-720c1d46]:hover{color:#2f54ed}.ml20[data-v-720c1d46]{margin-left:20px}.mr10[data-v-720c1d46]{margin-right:10px}.tips-content[data-v-720c1d46]{position:absolute;left:-4px;top:6px}.store-tips[data-v-720c1d46]{width:200px;position:absolute;left:-10px}.underline[data-v-720c1d46]{text-decoration:underline}.pickup-upload[data-v-720c1d46]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-720c1d46]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-720c1d46]{font-size:14px}.pickup-upload .pickup-list[data-v-720c1d46]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-720c1d46]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-720c1d46]{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-edf46648.be3ed50b.css

-.tab-top[data-v-3796b4e8]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-3796b4e8]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-3796b4e8]{height:60px}.table-content .img-text img[data-v-3796b4e8]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-3796b4e8]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-3796b4e8]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-3796b4e8]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-3796b4e8]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-3796b4e8]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-3796b4e8]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-3796b4e8]:hover{color:#2f54ed}.undeline-dash[data-v-3796b4e8]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-3796b4e8]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file

dist/js/chunk-6287d3af.0645b208.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,r){"use strict";r.d(e,"b",(function(){return n}));r("8e6e"),r("ac6a"),r("456d");var a=r("ade3"),i=r("71f6"),o=r("f121");function s(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,a)}return r}function p(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?s(Object(r),!0).forEach((function(e){Object(a["a"])(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):s(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,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",virtualErrorPage:"/gift/vir-card-error-page"},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,r){"use strict";r.r(e);var a=function(){var t=this,e=t.$createElement,r=t._self._c||e;return r("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[r("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[r("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[r("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"}}),r("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),r("el-form-item",[r("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?r("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=(r("8e6e"),r("ac6a"),r("456d"),r("ade3")),s=r("ed08"),p=r("cdc8");function c(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,a)}return r}function l(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?c(Object(r),!0).forEach((function(e){Object(o["a"])(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):c(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,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=r("2877"),m=Object(f["a"])(g,a,i,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file

dist/js/chunk-6287d3af.47d9377c.js

-(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-edf46648.da189466.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-edf46648"],{"2ebe":function(t,e,a){},"8fcb":function(t,e,a){"use strict";a("2ebe")},"924b":function(t,e,a){"use strict";a("ba4d")},ba4d:function(t,e,a){},bf73:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("div",{staticClass:"tab-top"},[a("el-input",{staticClass:"mr10 w350",attrs:{placeholder:t.placeholderText,clearable:""},on:{clear:t.getSearchList},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getSearchList(e)}},model:{value:t.search,callback:function(e){t.search=e},expression:"search"}},[a("el-select",{staticStyle:{width:"140px"},attrs:{slot:"prepend",placeholder:"礼品名称"},on:{change:t.handleChangeType},slot:"prepend",model:{value:t.searchType,callback:function(e){t.searchType=e},expression:"searchType"}},[a("el-option",{attrs:{label:"礼品名称",value:1}}),a("el-option",{attrs:{label:"礼品编码",value:2}}),a("el-option",{attrs:{label:"福利id",value:3}})],1)],1),a("el-input",{staticClass:"mr10 w220",attrs:{placeholder:"请输入操作人姓名搜索","prefix-icon":"el-icon-search",clearable:""},on:{clear:t.getSearchList},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getSearchList(e)}},model:{value:t.creatorName,callback:function(e){t.creatorName=e},expression:"creatorName"}}),a("el-date-picker",{attrs:{type:"daterange",align:"right","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:t.changeTime},model:{value:t.timeValue,callback:function(e){t.timeValue=e},expression:"timeValue"}})],1),a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"table-content"},[a("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:t.tableData}},[a("el-table-column",{attrs:{label:"上传时间",prop:"createTime",width:"300px"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{domProps:{innerHTML:t._s(t.listTime(e.row.createTime))}})]}}])}),a("el-table-column",{attrs:{prop:"creatorName",label:"操作人","min-width":"150px"}}),a("el-table-column",{attrs:{prop:"fileName",label:"文件名称","min-width":"150px"}}),a("el-table-column",{attrs:{prop:"giftName",label:"福利名称","min-width":"120px"}}),a("el-table-column",{attrs:{label:"上传结果","min-width":"150px"},scopedSlots:t._u([{key:"default",fn:function(e){return[0===e.row.statusFlag?a("div",[0===e.row.progress?a("span",[t._v("上传中")]):a("span",[t._v("上传失败")])]):a("div",[t._v("\n            成功"),a("span",{staticClass:"blue"},[t._v(t._s(e.row.successNum))]),t._v("条，失败"),a("span",{staticClass:"danger-color"},[t._v(t._s(e.row.errorNum))]),t._v("条，"),a("el-button",{attrs:{type:"text"},on:{click:t.checkDetail}},[t._v("查看详情")])],1)]}}])})],1),a("div",{directives:[{name:"show",rawName:"v-show",value:t.total>0,expression:"total > 0"}],staticClass:"pagination-conteiner",staticStyle:{background:"#fff"}},[a("div",{staticClass:"pagination"},[0!=t.total?a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[20,40,60,80],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange,"update:currentPage":function(e){t.currentPage=e},"update:current-page":function(e){t.currentPage=e}}}):t._e()],1)])],1),a("el-dialog",{attrs:{title:"查看详情",visible:t.dialogVisible,width:"30%","before-close":t.handleClose},on:{"update:visible":function(e){t.dialogVisible=e}}},[a("span",[t._v("这是一段信息")]),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(e){t.dialogVisible=!1}}},[t._v("取 消")]),a("el-button",{attrs:{type:"primary"},on:{click:function(e){t.dialogVisible=!1}}},[t._v("确 定")])],1)])],1)},s=[],r=(a("386d"),a("fab6")),o=a("ed08"),n=a("cdc8"),l=n["a"].virtualUploadLog,c={components:{},data:function(){return{bread:[{breadName:"礼品管理"},{breadName:"库存上传记录"}],formatDateTimeByType:o["e"],listTime:o["g"],mixins:[r["c"],r["a"]],proType:"",status:"",batchOperate:"",total:0,sortOrder:"",sortColumn:"",tableData:[],loading:!1,search:"",giftId:"",giftName:"",giftNo:"",creatorName:"",startTime:"",endTime:"",currentPage:1,pageSize:20,searchType:1,placeholderText:"请输入关键词搜索",isShow:!1,timeValue:[new Date-6048e5,(new Date).valueOf()],dialogVisible:!1}},created:function(){this.$emit("updateBread",this.bread),this.$emit("showAside",!0),this.init()},methods:{init:function(){this.getTableList()},getSearchList:function(){this.pageNum=1,this.getTableList()},changeTime:function(){this.timeValue?(this.startTime=this.formatDateTimeByType(this.timeValue[0],"yyyy-MM-dd"),this.endTime=this.formatDateTimeByType(this.timeValue[1],"yyyy-MM-dd")):(this.startTime="",this.endTime=""),this.currentPage=1,this.pageSize=20,this.getTableList()},handleChangeType:function(){1===this.searchType?(this.placeholderText="请输入礼品名称",this.giftName=this.search):2===this.searchType?(this.placeholderText="请输入礼品编码",this.giftNo=this.search):3===this.searchType&&(this.placeholderText="福利id",this.giftId=this.search)},getTableList:function(){var t=this,e={giftNo:this.giftNo,giftName:this.giftName,giftId:this.giftId,creatorName:this.creatorName,pageNum:this.currentPage,pageSize:this.pageSize,startTime:this.startTime,endTime:this.endTime};l(e).then((function(e){t.tableData=e.result.result}))},checkDetail:function(){this.dialogVisible=!0}}},d=c,p=(a("8fcb"),a("924b"),a("2877")),u=Object(p["a"])(d,i,s,!1,null,"3796b4e8",null);e["default"]=u.exports},cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return d}));a("8e6e"),a("ac6a"),a("456d");var i=a("ade3"),s=a("71f6"),r=a("f121");function o(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,i)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?o(Object(a),!0).forEach((function(e){Object(i["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):o(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var l={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"},c={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"}}};l=Object(s["a"])(l,r["f"]),c=Object(s["a"])(c,r["f"]),e["a"]=n(n({},l),c);r["c"].api,r["b"];var d=r["c"].api+r["f"]+"/export-pickup-store-excel"},fab6:function(t,e,a){"use strict";a.d(e,"c",(function(){return s})),a.d(e,"a",(function(){return r})),a.d(e,"b",(function(){return o}));var i=a("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(i["e"])(this[s][0],a),this.listParams[e]=Object(i["e"])(this[s][1],a)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file

src/api/gift.js

@@ -75,6 +75,7 @@ let realGift = {
   }, // 保存操作人权限数据
   getOperatorList: '/auth/operator-list', // 查询操作人权限回显数据
   virtualCostUpdate: '/gift/vir-cost-update', // 虚拟礼品调整库存
+  virtualErrorPage: '/gift/vir-card-error-page', // 虚拟礼品卡密上传错误日志分页
 };
 
 // 通用配置

src/views/gift-manage/module/update-virtual-stock.vue

@@ -4,18 +4,12 @@
       <el-form label-width="130px">
         <el-form-item label="导入券码文件" required>
           <div class="pickup-upload">
-            <input type="text" id="textfield" class="txt" />
-            <!-- <input type="file" name="file" onchange="document.getElementById('textfield').value = this.files[0].name;console.log(this.files)"> -->
-            <input type="file" name="file" @change="change">
-            <dm-upload-file
-              :show-file-list="false"
-              :action="uploadAction"
-              :on-success="successUpload"
-              accept=".xls,.xlsx"
-              :before-upload="beforeUpload"
-              with-credentials>
-              <el-button class="upload-trigger"><i class="iconfont-components4 icon-cp-shangc upload-icon"></i> 上传</el-button>
-              <span slot="tip" class="upload-tip inline-block">
+            <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">
+                <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">
                 <el-button style="margin-right: 30px" type="text" @click="downloadFile">下载文件模板</el-button>
                 <el-popover trigger="click" placement="right" popper-class="upload-popper">
                   <el-button slot="reference" type="text">查看导入规则</el-button>
@@ -26,8 +20,8 @@
                   </div>
                 </el-popover>
               </span>
-              <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
-            </dm-upload-file>
+              <div>{{ file.name }}</div>
+            </div>
             <div class="pickup-list" v-if="uploadFile.name">
               <p class="pickup-list-name">
                 <i class="iconfont-welfare4 icon-wenjian1 file-icon"></i>
@@ -89,14 +83,17 @@ export default {
       this.file = e.target.files[0];
       console.log(this.file);
     },
+    upload(){
+      this.change();
+    },
     getData(){
       console.log('获取成本数据');
     },
-    beforeUpload(file) {
-      console.log(file);
-      this.uploadFile.name = file.name;
-      // this.file = file;
-    },
+    // beforeUpload(file) {
+    //   console.log(file);
+    //   this.uploadFile.name = file.name;
+    //   // this.file = file;
+    // },
     downloadFile() {
       const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
       window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
@@ -106,7 +103,7 @@ export default {
       let params = {
         giftId: this.stockData.id,
         file: this.file,
-        remark: ''
+        remark: this.textarea
       };
       console.log(params.file);
       this.loading = true;
@@ -116,7 +113,7 @@ export default {
           setInterval(() => {
             this.$emit('closeUpdateStock');
           }, 10);
-          this.$message.success('修改成功');
+          this.$message.success(res.massage);
         }else{
           this.$message.error(res.message);
         }
@@ -129,11 +126,11 @@ export default {
         this.$emit('closeUpdateStock');
       }, 10);
     },
-    successUpload(response, file){
-      console.log(response);
-      console.log(file);
-      this.file = file;
-    },
+    // successUpload(response, file){
+    //   console.log(response);
+    //   console.log(file);
+    //   this.file = file;
+    // },
     // 合并单元格，行合并
     getSpanArr(data) {
       // data就是我们从后台拿到的数据
@@ -223,22 +220,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import '@/assets/styles/colors.scss';
-.upload-btn {
-  height: 32px;
-  border: 1px dashed rgba(192, 196, 204, 1);
-  display: inline-block;
-  font-size: 14px;
-  color: #c0c4cc;
-  cursor: pointer;
-  margin-right: 20px;
-  width: 84px;
-  border-radius: 4px;
-}
-.upload-btn .el-icon-upload2 {
-  font-size: 14px;
-  color: #c0c4cc;
-}
-.upload-btn:hover {
+.file-style:hover .upload-trigger {
   border-color: #1890ff;
 }
 .upload-ele .el-button {
@@ -255,9 +237,10 @@ export default {
 .pickup-upload{
   display: inline-block;
   vertical-align: top;
-  margin-left: 10px;
+  // margin-left: 10px;
   .upload-trigger{
     border-style: dashed;
+    margin-right: 10px;
     .upload-icon {
       font-size: 14px;
     }
@@ -275,7 +258,4 @@ export default {
     }
   }
 }
-// .upload-tip .upload-popper {
-//   padding: 10px 12px!important;
-// }
 </style>

src/views/gift-manage/stock-record.vue

 <template>
   <div>
     <div class="tab-top">
-      <el-input :placeholder="placeholderText" v-model="search" class="mr10 w350" clearable @keyup.enter.native="getSearchList" @clear="getSearchList">
-        <el-select v-model="searchType" slot="prepend" placeholder="礼品名称" style="width:140px;" @change="handleChangeType">
+      <el-input placeholder="请输入福利id" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getSearchList" @clear="getSearchList">
+        <!-- <el-select v-model="searchType" slot="prepend" placeholder="礼品名称" style="width:140px;" @change="handleChangeType">
           <el-option label="礼品名称" :value="1"></el-option>
           <el-option label="礼品编码" :value="2"></el-option>
           <el-option label="福利id" :value="3"></el-option>
-        </el-select>
+        </el-select> -->
       </el-input>
       <el-input placeholder="请输入操作人姓名搜索" prefix-icon="el-icon-search" v-model="creatorName" class="mr10 w220" clearable @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
       <el-date-picker v-model="timeValue" type="daterange" @change="changeTime" align="right" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
@@ -20,26 +20,26 @@
         </el-table-column>
         <el-table-column prop="creatorName" label="操作人" min-width="150px"></el-table-column>
         <el-table-column prop="fileName" label="文件名称" min-width="150px"></el-table-column>
-        <el-table-column prop="giftName" label="福利名称" min-width="120px"></el-table-column>
+        <el-table-column prop="giftName" label="福利名称" min-width="120px">
+          <template slot-scope="scope">
+            <el-button type="text" @click="goDetail(scope.row)">{{ scope.row.giftName }}</el-button>
+          </template>
+        </el-table-column>
         <el-table-column label="上传结果" min-width="150px">
           <template slot-scope="scope">
-            <div v-if="scope.row.statusFlag === 0">
-              <span v-if="scope.row.progress === 0">上传中</span>
-              <span v-else>上传失败</span>
-            </div>
-            <div v-else>
-              成功<span class="blue">{{ scope.row.successNum }}</span>条，失败<span class="danger-color">{{ scope.row.errorNum }}</span>条，<el-button type="text" @click="checkDetail">查看详情</el-button>
+            <div v-if="scope.row.statusFlag === 1">
+              成功<span class="blue">{{ scope.row.successNum }}</span>条，失败<span class="danger-color">{{ scope.row.errorNum }}</span>条
             </div>
+            <div v-else-if="scope.row.statusFlag === 0">上传中</div>
+            <div v-else>上传失败</div>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="操作" min-width="150px">
+        <el-table-column label="操作" min-width="150px">
           <template slot-scope="scope">
-            <div v-if="scope.row.statusFlag === 0">处理中</div>
-            <div v-else>
-              成功<span class="blue">{{ scope.row.success }}</span>条，失败<span class="danger-color">{{ scope.row.fail }}</span>条，<el-button type="text" @click="checkDetail">查看详情</el-button>
-            </div>
+            <el-button type="text" v-if="scope.row.statusFlag === 2" @click="uploadReview(scope.row)">重新上传</el-button>
+            <el-button type="text" v-if="scope.row.statusFlag === 1 && scope.row.errorNum !== 0" @click="checkDetail(scope.row)">查看失败原因</el-button>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
       <div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
         <div class="pagination">
@@ -47,8 +47,31 @@
         </div>
       </div>
     </div>
-    <el-dialog title="查看详情" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
-      <span>这是一段信息</span>
+    <el-dialog title="查看详情" :visible.sync="dialogVisible" width="40%" :before-close="handleClose">
+      <div>
+        <el-table :data="errorData">
+          <el-table-column prop="errorMsg" label="错误信息"></el-table-column>
+        </el-table>
+        <!-- <div class="imitation-table" style="width:100%;" v-loading="cardLoading">
+          <el-row class="thead">
+            <el-col :span="24">错误信息</el-col>
+          </el-row>
+          <div class="tbody">
+            <div class="td" v-for="(item, idx) in errorData" :key="idx">
+              <el-row v-if="errorData.length">
+                <el-col :span="24">{{ item.errorMsg }}</el-col>
+              </el-row>
+              <div class="empty_block" v-else></div>
+            </div>
+          </div>
+        </div> -->
+        <!-- <div class="empty_block mini" v-if="!totalError"></div> -->
+        <div class="pagination-conteiner" style="background:#fff;" v-show="totalError > 0">
+          <div class="pagination">
+            <dm-pagination small background @size-change="handleSizeErrorChange" @current-change="handleCurrentErrorChange" :current-page.sync="currentErrorPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageErrorSize" layout="total, sizes, prev, pager, next" :total="totalError" v-if="totalError != 0"> </dm-pagination>
+          </div>
+        </div>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
@@ -60,7 +83,7 @@
 import { page, formate } from '@/mixins/table.js';
 import { formatDateTimeByType, listTime } from '@/utils/index.js';
 import api from '@/api/gift.js';
-const { virtualUploadLog } = api;
+const { virtualUploadLog, virtualErrorPage } = api;
 export default {
   components: {
     // klal
@@ -86,6 +109,7 @@ export default {
       sortOrder: '',
       sortColumn: '',
       tableData: [],
+      errorData: [],
       loading: false,
       // 搜索条件
       search: '',
@@ -97,11 +121,14 @@ export default {
       endTime: '',
       currentPage: 1,
       pageSize: 20,
+      currentErrorPage: 1,
+      pageErrorSize: 20,
       searchType: 1,
       placeholderText: '请输入关键词搜索',
       isShow: false,
       timeValue: [ new Date() - 7 * 24 * 60 * 60 * 1000, new Date().valueOf() ],
       dialogVisible: false,
+      totalError: ''
     };
   },
   created() {
@@ -147,9 +174,9 @@ export default {
     getTableList() {
       console.log('获取列表详情');
       let params = {
-        giftNo: this.giftNo,
-        giftName: this.giftName,
-        giftId: this.giftId,
+        // giftNo: this.giftNo,
+        // giftName: this.giftName,
+        giftId: this.search,
         creatorName: this.creatorName,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
@@ -158,13 +185,42 @@ export default {
       };
       virtualUploadLog(params).then(res =>{
         console.log(res);
-        this.tableData = res.result.result;
+        this.tableData = res.result.result || [];
         console.log(this.tableData);
       });
     },
-    checkDetail(){
+    checkDetail(item){
       this.dialogVisible = true;
-    }
+      let params = {
+        id: item.uploadLogId,
+        key: '',
+        pageNum: this.currentErrorPage,
+        pageSize: this.pageErrorSize,
+      };
+      virtualErrorPage(params).then(res => {
+        if(res.code === '0000'){
+          console.log(res.result);
+          this.errorData = res.result.result || [];
+          this.totalError = res.result.totalCount;
+        }else{
+          this.$message(res.message);
+        }
+      });
+    },
+    goDetail(item){
+      if(item.source === 0){
+        this.$router.push({ path: '/gift-manage/virtual-gift-detail', query: { giftId: item.giftId } });
+      }else{
+        this.$router.push({ path: '/gic-card/info', query: { id: item.giftId } });
+      }
+    },
+    uploadReview(item){
+      if(item.source === 0){
+        this.$router.push({ path: '/gift-manage/virtual-gift', query: { giftId: item.giftId } });
+      }else{
+        this.$router.push({ path: '/gic-card/list', query: { couponId: item.giftId } });
+      }
+    },
   },
 };
 </script>

src/views/gift-manage/virtual-gift-detail.vue

@@ -87,15 +87,18 @@
                           <div class="pickup-upload">
                             <span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
                             <dm-upload-file
+                              width="300"
+                              class="inline-block"
                               :show-file-list="false"
                               :action="uploadAction"
                               :on-success="successUpload"
                               accept=".xls,.xlsx"
-                              :before-upload="beforeUpload"
+                              :before-upload="beforeUploadFile"
+                              :data="{ giftId: giftId, remark: '' }"
                               with-credentials>
                               <el-button class="upload-trigger"><i class="iconfont-components4 icon-cp-shangc upload-icon"></i> 上传</el-button>
                               <span slot="tip" class="upload-tip inline-block">
-                                <el-button style="margin-right: 30px" type="text" @click="downloadFile">下载文件模板</el-button>
+                                <!-- <el-button style="margin-right: 30px" type="text" @click="downloadFile">下载文件模板</el-button> -->
                                 <el-popover trigger="click" placement="right" popper-class="upload-popper">
                                   <el-button slot="reference" type="text">查看导入规则</el-button>
                                   <div class="upload-tip-text">
@@ -104,16 +107,16 @@
                                     <p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
                                   </div>
                                 </el-popover>
+                                <el-button type="text" class="inline-block ml20" @click="checkUploadDetail">查看内容</el-button>
                               </span>
                               <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
                             </dm-upload-file>
-                            <div class="pickup-list" v-if="uploadFile.name">
+                            <!-- <div class="pickup-list" v-if="uploadFile.name">
                               <p class="pickup-list-name">
                                 <i class="iconfont-welfare4 icon-wenjian1 file-icon"></i>
                                 {{ uploadFile.name }}
-                                <el-button type="text" class="block" @click="checkUploadDetail">查看内容</el-button>
                               </p>
-                            </div>
+                            </div> -->
                           </div>
                         </div>
                       </el-step>
@@ -172,14 +175,14 @@
 </template>
 <script>
 import { request } from '../../utils/request';
-// import { deepClone } from '../../utils/index';
+import { welfarePrefix } from '@/config';
 import api from '@/api/gift.js';
 import uploadUrl from '@/api/common.js';
 const {
   giftGet,
   giftUpdate,
   giftSave,
-  virtualGiftUpload,
+  // virtualGiftUpload,
   getGiftId,
   // getOperatorList,
   giftTemplateDownload } = api;
@@ -234,7 +237,7 @@ export default {
         marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
         virCostPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
         refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
-        deliveryType: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
+        // deliveryType: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
         checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ]
       },
       giftId: '',
@@ -245,7 +248,8 @@ export default {
       actionUrl: '/api-plug/upload-images', // 必选参数，上传的相对地址 String 类型,切勿硬编码写死地址
       maxlength: 5, // 图片数量 默认 5
       // uploadAction: window.location.origin + '/api-marketing/upload/upload-image?requestProject=marketing',
-      uploadAction: 'https://four.gicdev.com/api-marketing/upload/upload-image?requestProject=welfare',
+      // uploadAction: 'https://four.gicdev.com/api-marketing/upload/upload-image?requestProject=welfare',
+      uploadAction: `${welfarePrefix}/gift/vir-gift-upload`,
       openStorePick: 0,
       btnLoading: false,
       loading: false,
@@ -312,14 +316,14 @@ export default {
       // console.log(result);
       // let fileUrl = result.url;
       // console.log(fileUrl);
-      let params = {
-        giftId: this.giftId,
-        file: file,
-        remark: ''
-      };
-      virtualGiftUpload(params).then(res =>{
-        console.log(res);
-      });
+      // let params = {
+      //   giftId: this.giftId,
+      //   file: file,
+      //   remark: ''
+      // };
+      // virtualGiftUpload(params).then(res =>{
+      //   console.log(res);
+      // });
     },
     downloadFile() {
       const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
@@ -467,7 +471,7 @@ export default {
             this.goodsForm.giftNo = resResult.giftNo;
             this.goodsForm.stock = resResult.stock;
             this.goodsForm.giftBarNo = resResult.giftBarNo;
-            this.goodsForm.costPrice = resResult.virCostPrice;
+            this.goodsForm.virCostPrice = resResult.virCostPrice;
             // this.goodsForm.tableData[0].giftNo = resResult.giftNo;
             // this.goodsForm.tableData[0].stock = resResult.stock;
             // this.goodsForm.tableData[0].giftBarNo = resResult.giftBarNo;
@@ -476,7 +480,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', '2' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
             this.goodsForm.deliveryType = resResult.deliveryType;
             this.goodsForm.giftImages = resResult.giftImages;
             this.goodsForm.stockUseType = resResult.stockUseType;

src/views/gift-manage/virtual-gift.vue

@@ -287,6 +287,7 @@ export default {
   created() {
     this.$emit('updateBread', this.bread);
     this.$emit('showAside', true);
+    this.query.giftId = this.$route.query.giftId;
     this.init();
   },
   methods: {