Skip to content

W
welfare
Commit 13399a03 by 萱草
Options

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

# Conflicts:
#	dist/index.html
#	dist/js/chunk-13af10ee.1e23dcea.js
#	dist/js/chunk-15f5a088.7a54ea66.js
#	dist/js/chunk-1ff25420.7cec55d4.js
#	dist/js/chunk-53f4695c.da28a450.js
#	dist/js/chunk-7f083f49.8af3d1c9.js
#	dist/js/chunk-7f6e53d4.77a80caa.js
#	dist/js/chunk-7f6e53d4.c9bb109d.js
parents f9be8375 26c07046
Showing with 75 additions and 58 deletions
dist/css/chunk-06bca770.c6118485.css 0 → 100644
.tab-top[data-v-fb2453b0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-fb2453b0],.tab-top[data-v-fb2453b0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-fb2453b0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-fb2453b0]{height:60px}.table-content .img-text img[data-v-fb2453b0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-fb2453b0]{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-fb2453b0]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-fb2453b0]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-fb2453b0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-fb2453b0]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-fb2453b0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-fb2453b0]:hover{color:#2f54ed}.undeline-dash[data-v-fb2453b0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-fb2453b0]{display:inline-block;line-height:32px}
\ No newline at end of file
dist/css/chunk-13af10ee.76e2245d.css deleted 100644 → 0
.upload-btn[data-v-d08664b6]{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-d08664b6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-d08664b6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-d08664b6]{border:none;color:#c0c4cc;margin-left:60px}.upload-ele .el-button--small[data-v-d08664b6]{padding:0}.uploadText p[data-v-d08664b6]{line-height:26px}.tab-top[data-v-4b0bc947]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-4b0bc947],.tab-top[data-v-4b0bc947]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-4b0bc947]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-4b0bc947]{height:60px}.table-content .img-text img[data-v-4b0bc947]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-4b0bc947]{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-4b0bc947]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-4b0bc947]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-4b0bc947]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-4b0bc947]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-4b0bc947]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-4b0bc947]:hover{color:#2f54ed}.undeline-dash[data-v-4b0bc947]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-4b0bc947]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
dist/css/chunk-15f5a088.d41a13fb.css deleted 100644 → 0
.upload-btn[data-v-5f050120]{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-5f050120]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-5f050120]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-5f050120]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-5f050120]{padding:0}.w-630[data-v-5f050120]{width:630px}.mb56[data-v-5f050120]{margin-bottom:56px}.from-content[data-v-5f050120]{position:relative}.from-content .demo-ruleForm .form-section[data-v-5f050120]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-5f050120]{color:#303133;font-size:14px;font-weight:700;margin-bottom:20px;margin-left:20px;padding-bottom:20px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section .tip-warm[data-v-5f050120]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-5f050120]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-5f050120]{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-5f050120]{margin-top:12px}.from-content .anchor-link[data-v-5f050120]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-5f050120]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.ml20[data-v-5f050120]{margin-left:20px}.mr10[data-v-5f050120]{margin-right:10px}.tips-content[data-v-5f050120]{position:absolute;left:-4px;top:8px}.store-tips[data-v-5f050120]{width:200px;position:absolute;left:-10px}.underline[data-v-5f050120]{text-decoration:underline}.table-error .el-form-item__error{display:none!important}.damolish .el-form-item__label:after{content:""}.damolish .el-tooltip__popper{width:245px}table th.star div:before{content:"*";color:red}.right-border{border-right:1px solid #ebeef5}.mopney-input span{display:none!important}.from-content .see-btn{color:#909399;margin-left:15px}.from-content .see-btn:hover{color:#2f54ed}
\ No newline at end of file
dist/css/chunk-1ff25420.730564a7.css deleted 100644 → 0
.tab-top[data-v-40c29954]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-40c29954],.tab-top[data-v-40c29954]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-40c29954]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-40c29954]{height:60px}.table-content .img-text img[data-v-40c29954]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-40c29954]{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-40c29954]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-40c29954]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-40c29954]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-40c29954]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-40c29954]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-40c29954]:hover{color:#2f54ed}.undeline-dash[data-v-40c29954]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-40c29954]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
dist/css/chunk-29caaa4b.221c4879.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}
\ No newline at end of file
dist/css/chunk-422e5436.fc75a5d1.css 0 → 100644
.dash-style[data-v-5305571c]{border-bottom:1px dashed #2f54eb}.w-630[data-v-5305571c]{width:630px}.w-480[data-v-5305571c]{width:480px}.w-350[data-v-5305571c]{width:350px}.w-900[data-v-5305571c]{width:900px}.mb56[data-v-5305571c]{margin-bottom:56px}.from-content[data-v-5305571c]{position:relative}.from-content .demo-ruleForm .form-section[data-v-5305571c]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-5305571c]{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-5305571c]: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-5305571c]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-5305571c]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list[data-v-5305571c]{width:900px;margin-bottom:20px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item[data-v-5305571c]{width:100%}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name[data-v-5305571c]{padding:8px;background:#f3f6f9;position:relative}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-title[data-v-5305571c]{color:#909399;margin-right:7px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-value-title[data-v-5305571c]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-5305571c]{color:#909399;font-size:14px;position:absolute;right:20px;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-5305571c]:hover{color:#2f54ed}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content[data-v-5305571c]{padding:15px 8px 5px 8px;display:-webkit-box;display:-ms-flexbox;display:flex}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .sku-value-title[data-v-5305571c]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list[data-v-5305571c]{display:inline-block;-webkit-box-flex:1;-ms-flex:1;flex:1}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item[data-v-5305571c]{border:1px solid #e4e7ed;padding:10px 8px;border-radius:4px;display:inline-block;margin-right:7px;position:relative;margin-bottom:10px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item .el-icon-error[data-v-5305571c]{font-size:16px;position:absolute;right:-10px;top:-5px;color:#c0c4cc;display:none;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item:hover .el-icon-error[data-v-5305571c]{display:inline-block;color:#909399}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content[data-v-5305571c]{padding:10px;width:900px;border:1px solid #dcdfe6;border-radius:2px}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content .batch-box[data-v-5305571c]{padding-left:130px;font-size:0;height:40px}.from-content .demo-ruleForm .fixed-btn[data-v-5305571c]{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-5305571c]{margin-top:12px}.from-content .anchor-link[data-v-5305571c]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-5305571c]{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-5305571c]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-5305571c]:hover{color:#2f54ed}.ml20[data-v-5305571c]{margin-left:20px}.mr10[data-v-5305571c]{margin-right:10px}.mr16[data-v-5305571c]{margin-right:16px}.table-img[data-v-5305571c]{display:inline-block;width:32px;height:32px;border-radius:4px;border:1px dashed #d9d9d9;cursor:pointer;text-align:center;vertical-align:top;position:relative}.table-img img[data-v-5305571c]{width:30px;height:30px}.table-img[data-v-5305571c]:hover{border:1px dashed #2f54ed}.img-modal[data-v-5305571c]{width:32px;height:32px;position:absolute;left:-1px;top:-1px;background:rgba(0,0,0,.5);display:none;cursor:pointer;border-radius:4px}.img-modal .el-icon-delete[data-v-5305571c]{color:#fff}.table-img:hover .img-modal[data-v-5305571c]{display:inline-block}.tips-content[data-v-5305571c]{position:absolute;left:-4px;top:8px}.store-tips[data-v-5305571c]{width:200px;position:absolute;left:-10px}.right-border{border-right:1px solid #ebeef5}.sku-table-content .sku-table th{line-height:17px!important}
\ No newline at end of file
dist/css/chunk-4a3bda1e.e7f7b512.css 0 → 100644
.upload-btn[data-v-d08664b6]{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-d08664b6]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-d08664b6]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-d08664b6]{border:none;color:#c0c4cc;margin-left:60px}.upload-ele .el-button--small[data-v-d08664b6]{padding:0}.uploadText p[data-v-d08664b6]{line-height:26px}.tab-top[data-v-39032a04]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-39032a04],.tab-top[data-v-39032a04]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-39032a04]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-39032a04]{height:60px}.table-content .img-text img[data-v-39032a04]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-39032a04]{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-39032a04]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-39032a04]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-39032a04]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-39032a04]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-39032a04]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-39032a04]:hover{color:#2f54ed}.undeline-dash[data-v-39032a04]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-39032a04]{display:inline-block;line-height:32px}
\ No newline at end of file
dist/css/chunk-4ce6396a.6670dfff.css 0 → 100644
.step-text[data-v-32af5faa]{color:#000;font-size:14px}.dash-style[data-v-32af5faa]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-32af5faa]{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-32af5faa]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-32af5faa]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-32af5faa]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-32af5faa]{padding:0}.w-630[data-v-32af5faa]{width:630px}.mb56[data-v-32af5faa]{margin-bottom:56px}.from-content[data-v-32af5faa]{position:relative}.from-content .demo-ruleForm .form-section[data-v-32af5faa]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-32af5faa]{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-32af5faa]: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-32af5faa]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-32af5faa]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-32af5faa]{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-32af5faa]{margin-top:12px}.from-content .anchor-link[data-v-32af5faa]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-32af5faa]{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-32af5faa]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-32af5faa]:hover{color:#2f54ed}.ml20[data-v-32af5faa]{margin-left:20px}.mr10[data-v-32af5faa]{margin-right:10px}.tips-content[data-v-32af5faa]{position:absolute;left:-4px;top:6px}.store-tips[data-v-32af5faa]{width:200px;position:absolute;left:-10px}.underline[data-v-32af5faa]{text-decoration:underline}.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.3e50b9df.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.662d0a9d.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.51dd68da.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 i=a("ade3"),r=a("71f6"),o=a("f121");function s(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 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(i["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 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:"/gift/template-download",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-updat",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",useFormData:!0}},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:"/pickup/del-pickup",insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}}};l=Object(r["a"])(l,o["f"]),n=Object(r["a"])(n,o["f"]),e["a"]=c(c({},l),n);o["c"].api,o["b"]},fa56: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",{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)},r=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),c=a("cdc8");function l(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?l(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):l(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p=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,p({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,i,r,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file
dist/js/chunk-6287d3af.d4716f4a.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a("8e6e"),a("ac6a"),a("456d");var i=a("ade3"),r=a("71f6"),o=a("f121");function s(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 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(i["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 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:"/gift/vir-gift-template-download",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",useFormData:!0}},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:"/pickup/del-pickup",insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}}};l=Object(r["a"])(l,o["f"]),n=Object(r["a"])(n,o["f"]),e["a"]=c(c({},l),n);o["c"].api,o["b"]},fa56: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",{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)},r=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),c=a("cdc8");function l(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?l(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):l(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p=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,p({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,i,r,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file
dist/js/chunk-ad95361e.8f4209e3.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-ad95361e"],{cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("ade3"),s=i("71f6"),n=i("f121");function r(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function l(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?r(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):r(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var o={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:"/gift/template-download",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-updat",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",useFormData:!0}},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:"/pickup/del-pickup",insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}}};o=Object(s["a"])(o,n["f"]),c=Object(s["a"])(c,n["f"]),e["a"]=l(l({},o),c);n["c"].api,n["b"]},e54f:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-input",{staticClass:"w400 mrAuto",attrs:{"prefix-icon":"el-icon-search",clearable:"",placeholder:"请输入自提点名称进行搜索"},on:{change:t.refresh},model:{value:t.listParams.name,callback:function(e){t.$set(t.listParams,"name",e)},expression:"listParams.name"}}),i("el-select",{staticClass:"more-select mr10",attrs:{placeholder:"批量操作"},on:{change:t.mutiOption}},[i("el-option",{attrs:{disabled:!t.selectList.length,value:0}},[t._v("批量设置")]),i("el-option",{attrs:{disabled:!t.selectList.length,value:1}},[t._v("批量删除")])],1),i("el-button",{attrs:{type:"default"}},[t._v("导出自提点")]),i("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/pickup-add")}}},[t._v("新建自提点")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList},on:{"selection-change":function(e){t.selectList=e}}},[i("el-table-column",{attrs:{type:"selection",width:"55"}}),i("el-table-column",{attrs:{label:"自提点名称",prop:"name","min-width":"180px;"}}),i("el-table-column",{attrs:{label:"自提点地址",prop:"address","min-width":"180px;"}}),i("el-table-column",{attrs:{label:"联系电话",prop:"phone","min-width":"140px;"}}),i("el-table-column",{attrs:{label:"自提时间可选","min-width":"120px;"},scopedSlots:t._u([{key:"default",fn:function(e){return[0===e.row.openChooseTime?i("p",{staticClass:"address-type"},[t._v("不可选")]):t._e(),1===e.row.openChooseTime?i("p",{staticClass:"address-type"},[t._v("可选")]):t._e()]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("setting/pickup-edit?id="+e.row.pickupId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row.pickupId)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1),i("div",{staticClass:"clearfix"},[t.tableList.length?i("dm-pagination",{staticClass:"fr mb0",attrs:{background:"","current-page":t.listParams.currentPage,"page-sizes":[20,40,60,80],"page-size":t.listParams.pageSize,layout:"total, sizes, prev, pager, next",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}}):t._e()],1)],1)},s=[],n=i("fab6"),r=i("cdc8"),l=r["a"].pickupList,o=r["a"].delPickup,c={name:"PickupList",mixins:[n["c"]],data:function(){return{loading:!1,listParams:{name:"",currentPage:1,pageSize:20},total:0,tableList:[],pickedForm:{dialogVisible:!1,selectIdList:[],list:[{timeRange:[]}]},selectList:[]}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{mutiOption:function(t){1==t&&this.del(this.selectList.map((function(t){return t.pickupId})).join(","))},del:function(t){var e=this;this.loading=!0,o({pickupIds:t}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"操作成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,l().then((function(e){t.loading=!1;var i=e.result;t.tableList=i.result||[],t.total=i.totalCount,0===t.tableList.length&&1!==t.listParams.currentPage&&(t.listParams.currentPage-=1,t.getTableList())})).finally((function(){t.loading=!1})))}}},d=c,p=i("2877"),u=Object(p["a"])(d,a,s,!1,null,null,null);e["default"]=u.exports},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return n})),i.d(e,"b",(function(){return r}));var a=i("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()}}},n={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",i=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(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},r={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
dist/js/chunk-ad95361e.e0b77ae4.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-ad95361e"],{cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("ade3"),s=i("71f6"),n=i("f121");function r(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function l(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?r(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):r(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var o={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:"/gift/vir-gift-template-download",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",useFormData:!0}},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:"/pickup/del-pickup",insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}}};o=Object(s["a"])(o,n["f"]),c=Object(s["a"])(c,n["f"]),e["a"]=l(l({},o),c);n["c"].api,n["b"]},e54f:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-input",{staticClass:"w400 mrAuto",attrs:{"prefix-icon":"el-icon-search",clearable:"",placeholder:"请输入自提点名称进行搜索"},on:{change:t.refresh},model:{value:t.listParams.name,callback:function(e){t.$set(t.listParams,"name",e)},expression:"listParams.name"}}),i("el-select",{staticClass:"more-select mr10",attrs:{placeholder:"批量操作"},on:{change:t.mutiOption}},[i("el-option",{attrs:{disabled:!t.selectList.length,value:0}},[t._v("批量设置")]),i("el-option",{attrs:{disabled:!t.selectList.length,value:1}},[t._v("批量删除")])],1),i("el-button",{attrs:{type:"default"}},[t._v("导出自提点")]),i("el-button",{attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/pickup-add")}}},[t._v("新建自提点")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList},on:{"selection-change":function(e){t.selectList=e}}},[i("el-table-column",{attrs:{type:"selection",width:"55"}}),i("el-table-column",{attrs:{label:"自提点名称",prop:"name","min-width":"180px;"}}),i("el-table-column",{attrs:{label:"自提点地址",prop:"address","min-width":"180px;"}}),i("el-table-column",{attrs:{label:"联系电话",prop:"phone","min-width":"140px;"}}),i("el-table-column",{attrs:{label:"自提时间可选","min-width":"120px;"},scopedSlots:t._u([{key:"default",fn:function(e){return[0===e.row.openChooseTime?i("p",{staticClass:"address-type"},[t._v("不可选")]):t._e(),1===e.row.openChooseTime?i("p",{staticClass:"address-type"},[t._v("可选")]):t._e()]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("setting/pickup-edit?id="+e.row.pickupId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row.pickupId)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1),i("div",{staticClass:"clearfix"},[t.tableList.length?i("dm-pagination",{staticClass:"fr mb0",attrs:{background:"","current-page":t.listParams.currentPage,"page-sizes":[20,40,60,80],"page-size":t.listParams.pageSize,layout:"total, sizes, prev, pager, next",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}}):t._e()],1)],1)},s=[],n=i("fab6"),r=i("cdc8"),l=r["a"].pickupList,o=r["a"].delPickup,c={name:"PickupList",mixins:[n["c"]],data:function(){return{loading:!1,listParams:{name:"",currentPage:1,pageSize:20},total:0,tableList:[],pickedForm:{dialogVisible:!1,selectIdList:[],list:[{timeRange:[]}]},selectList:[]}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{mutiOption:function(t){1==t&&this.del(this.selectList.map((function(t){return t.pickupId})).join(","))},del:function(t){var e=this;this.loading=!0,o({pickupIds:t}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"操作成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,l().then((function(e){t.loading=!1;var i=e.result;t.tableList=i.result||[],t.total=i.totalCount,0===t.tableList.length&&1!==t.listParams.currentPage&&(t.listParams.currentPage-=1,t.getTableList())})).finally((function(){t.loading=!1})))}}},d=c,p=i("2877"),u=Object(p["a"])(d,a,s,!1,null,null,null);e["default"]=u.exports},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return n})),i.d(e,"b",(function(){return r}));var a=i("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()}}},n={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",i=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(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},r={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
dist/js/gic-card.102c1c22.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.5bc4cc1e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api/gift.js
......@@ -28,7 +28,7 @@ let realGift = {
giftStockRecord: '/gift/stock-record', // 库存记录
giftStockLog: '/gift/stock-record-log', // 库存操作记录
giftActivity: '/gift/activity-statistics', // 活动统计
giftTemplateDownload: '/gift/template-download', // 下载模板
giftTemplateDownload: '/gift/vir-gift-template-download', // 下载虚拟礼品模板
giftTemplateUpload: '/gift/template-upload', // 上传模板
giftBatchUpdate: {
// 礼品批量操作
......@@ -49,7 +49,7 @@ let realGift = {
method: 'post'
}, // 批量操作
realCostUpdate: {
url: '/gift/real-cost-updat',
url: '/gift/real-cost-update',
method: 'post'
}, // 实物礼品调整成本
realStockUpdate: {
......
src/views/gift-manage/module/check-upload-detail.vue
......@@ -4,7 +4,7 @@
<div>
<el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
</div>
<el-table :data="tableData">
<el-table :data="tableData" class="mt20">
<el-table-column label="卡号" prop="paramOne"></el-table-column>
<el-table-column label="卡密/券码" prop="paramTwo"></el-table-column>
<el-table-column label="当前状态" prop="statusFlag">
......
src/views/gift-manage/module/select-pickup-store.vue
......@@ -23,8 +23,7 @@
:filter-method="onFilterStore"
:props="{ key: 'storeCode', label: 'name' }"
:data="pickupList"
@change="onTransferChange"
@left-check-change="onCheckChange">
@change="onTransferChange">
<div slot-scope="{ option }" class="transfer-item">
<el-tooltip popper-class="transfer-tip" :content="option.name" placement="top-start" v-if="option.nameIsOverflow">
<p class="store-name">{{ option.name }}</p>
......@@ -177,12 +176,6 @@ export default {
onTransferChange(shopCodeList) {
this.$emit('change', Object.assign({}, this.data, { shopCodeList }));
},
// 部分自提点-左侧选中的自提点
onCheckChange(shopCodeList) {
if (shopCodeList.length >= 100) {
this.$message.warning('最多只能选择100个');
}
},
// 部分自提点-穿梭框的搜索方法
onFilterStore(query, item) {
return (typeof item.name == 'string' && item.name.indexOf(query) >= 0) || item.storeCode.toString().indexOf(query) >= 0;
......
src/views/gift-manage/real-gift.vue
......@@ -51,15 +51,23 @@
<span>{{ scope.row.giftName }}</span>
<i class="el-icon-edit-outline" @click="handleName(scope.row)"></i>
</p>
<p class="goods-code">礼品编码：{{ scope.row.giftNo }}</p>
<p class="goods-code">福利id：{{ scope.row.giftId }}</p>
<p class="goods-code">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<p class="goods-code">福利id：{{ scope.row.giftId }}</p>
<div>更新时间：<p class="inline-block" v-html="listTime(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question"></i>
</el-tooltip>
礼品编码：{{ scope.row.giftNo }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="updateName" label="更新时间" sortable="custom" min-width="150px">
<!-- <el-table-column prop="updateName" label="更新时间" sortable="custom" min-width="150px">
<template slot-scope="scope"><span v-html="listTime(scope.row.updateTime)"></span></template>
</el-table-column>
</el-table-column> -->
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
<template slot-scope="scope">
<p class="stock-box">
......@@ -73,7 +81,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">库存</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存：福利可以被直接使用和被应用占用的数量；<br>
已占用：福利已经被应用通过”固定库存“方式占用的数量；<br>
总库存：福利实际未产生履约单，还可以被出库的数量；<br>
......@@ -98,7 +106,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">总出库量</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存：福利可以被直接使用和被应用占用的数量；<br>
已占用：福利已经被应用通过”固定库存“方式占用的数量；<br>
总库存：福利实际未产生履约单，还可以被出库的数量；<br>
......@@ -112,8 +120,11 @@
</el-table-column>
<el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" content="隐藏后福利组件中不展示，其他应用不可增加占用数量，已占用的库存不影响使用" placement="top">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">是否隐藏</span>
<span slot="content" style="width:240px">
隐藏后福利组件中不展示，其他应用不可增加占用数量，已占用的库存不影响使用
</span>
</el-tooltip>
</template>
<template slot-scope="scope">
......@@ -159,7 +170,7 @@ import updateName from './module/update-name.vue';
// import updateStock from './module/update-stock.vue';
import updateMultiStock from './module/update-multi-stock.vue';
import api from '@/api/gift.js';
const { giftPage, batchUpdate, getGiftId } = api;
const { giftPage, batchUpdate } = api;
export default {
components: {
// UpdateCost,
......@@ -289,12 +300,16 @@ export default {
}
if (value.prop === 'updateTime') {
this.query.sortColumn = 'update_time';
} else if (value.prop === 'costPrice') {
this.query.sortColumn = 'cost_price';
} else if (value.prop === 'costPrice' && value.order == 'ascending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'costPrice' && value.order == 'descending') {
this.query.sortColumn = 'min_cost_price';
} else if (value.prop === 'stock') {
this.query.sortColumn = 'stock';
this.query.sortColumn = 'remained_stock';
}
this.getTableList();
// min_cost_price asc 成本价
// max_cost_price desc
},
changeTime(){
if(this.timeValue){
......@@ -463,24 +478,16 @@ export default {
// this.updateCostData.costPrice = item.costPrice;
// this.updateCostData.textarea = item.textarea;
this.updateCostDialog = true;
console.log(this.updateCostDialog);
},
closeUpdateCost() {
this.integralDate.id = '';
this.integralDate.costPrice = '';
// this.integralDate.id = '';
// this.integralDate.costPrice = '';
this.updateCostDialog = false;
},
add() {
console.log('新建礼品,跳转');
let giftId;
getGiftId().then(res =>{
if(res.code === '0000'){
giftId = res.result;
this.$router.push({ path: '/gift-manage/real-gift-detail', query: { giftId: giftId } });
console.log(res.result);
}else{
this.$message.error(res.message);
}
});
this.$router.push({ path: '/gift-manage/real-gift-detail', query: { giftId: '' } });
},
edit(item) {
// console.log('编辑实物礼品', item);
......@@ -534,7 +541,7 @@ export default {
color: #606266;
line-height: 18px;
font-size: 14px;
margin-bottom: 10px;
margin-bottom: 25px;
}
.goods-code {
color: #909399;
......@@ -570,7 +577,7 @@ export default {
}
</style>
<style>
.damolish .el-tooltip__popper{
/* .damolish .el-tooltip__popper{
width: 240px;
}
} */
</style>
\ No newline at end of file
src/views/gift-manage/virtual-gift.vue
......@@ -52,16 +52,24 @@
<span>{{ scope.row.giftName }}</span>
<i class="el-icon-edit-outline" @click="handleName(scope.row)"></i>
</p>
<p class="goods-code">礼品编码：{{ scope.row.giftNo }}</p>
<p class="goods-code">福利id：{{ scope.row.giftId }}</p>
<p class="goods-code">
<el-tooltip open-delay="200" effect="dark" placement="top">
<div slot="content">
<p class="goods-code">福利id：{{ scope.row.giftId }}</p>
<div>更新时间：<p class="inline-block" v-html="listTime(scope.row.updateTime)"></p></div>
</div>
<i class="el-icon-question"></i>
</el-tooltip>
礼品编码：{{ scope.row.giftNo }}
</p>
</div>
</div>
</template>
</el-table-column>
<el-table-column prop="updateTime" label="更新时间" sortable="custom" min-width="150px">
<!-- <el-table-column prop="updateTime" label="更新时间" sortable="custom" min-width="150px"> -->
<!-- <template slot-scope="scope">{{ formatDateTimeByType(scope.row.updateName) }}</template> -->
<template slot-scope="scope"><span v-html="listTime(scope.row.updateTime)"></span></template>
</el-table-column>
<!-- <template slot-scope="scope"><span v-html="listTime(scope.row.updateTime)"></span></template> -->
<!-- </el-table-column> -->
<el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
<template slot-scope="scope">
<p class="stock-box">
......@@ -75,7 +83,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">库存</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存：福利可以被直接使用和被应用占用的数量；<br>
已占用：福利已经被应用通过”固定库存“方式占用的数量；<br>
总库存：福利实际未产生履约单，还可以被出库的数量；<br>
......@@ -100,7 +108,7 @@
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">总出库量</span>
<span slot="content">
<span slot="content" style="width:240px">
可占库存：福利可以被直接使用和被应用占用的数量；<br>
已占用：福利已经被应用通过”固定库存“方式占用的数量；<br>
总库存：福利实际未产生履约单，还可以被出库的数量；<br>
......@@ -114,8 +122,11 @@
</el-table-column>
<el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
<template slot="header">
<el-tooltip open-delay="200" effect="dark" style="width:250px" content="隐藏后福利组件中不展示，其他应用不可增加占用数量，已占用的库存不影响使用" placement="top">
<el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
<span class="undeline-dash">是否隐藏</span>
<span slot="content" style="width:240px">
隐藏后福利组件中不展示，其他应用不可增加占用数量，已占用的库存不影响使用
</span>
</el-tooltip>
</template>
<template slot-scope="scope">
......@@ -640,7 +651,7 @@ export default {
color: #606266;
line-height: 18px;
font-size: 14px;
margin-bottom: 10px;
margin-bottom: 25px;
}
.goods-code {
color: #909399;
......@@ -676,7 +687,7 @@ export default {
}
</style>
<style>
.damolish .el-tooltip__popper{
/* .damolish .el-tooltip__popper{
width: 240px;
}
} */
</style>
\ No newline at end of file
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