Skip to content

W
welfare
Commit 4989a1fe by shaojiawen
Options

Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

parents f97e9ade d7c3e8a1
Showing with 368 additions and 88 deletions
dist/css/chunk-2116ff36.85651583.css deleted 100644 → 0
.tab-top[data-v-c6ccc548]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-c6ccc548]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-c6ccc548]{height:60px}.table-content .img-text img[data-v-c6ccc548]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-c6ccc548]{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-c6ccc548]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-c6ccc548]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-c6ccc548]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-c6ccc548]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-c6ccc548]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-c6ccc548]:hover{color:#2f54ed}.undeline-dash[data-v-c6ccc548]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-c6ccc548]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
dist/css/gic-card.f8840ff8.css 0 → 100644
.upload[data-v-3fa9aee0]{display:inline-block;width:175px;line-height:15px!important}.file-list[data-v-3fa9aee0]{margin-left:95px}.file-list li[data-v-3fa9aee0]{height:37px;line-height:37px;background:#f2f3f7;border-radius:2px;margin-bottom:5px;padding-left:13px;padding-right:27px;margin-top:10px}.file-list li i[data-v-3fa9aee0]{margin-top:12px}.file-list li p[data-v-3fa9aee0]{display:inline-block;width:80%;margin-left:5px}.rule[data-v-3fa9aee0]{color:#909399;padding-top:22px;margin-top:36px;border-top:1px solid #e4e7ed;margin-bottom:11px}.rule+ul[data-v-3fa9aee0]{color:#909399}.rule+ul li[data-v-3fa9aee0]{font-size:12px;line-height:20px}.ct[data-v-1a4621fb]{padding-left:20px;padding-right:20px;position:relative}.ct i[data-v-1a4621fb]{position:absolute;left:0;top:3px}.ct p[data-v-1a4621fb]{font-size:13px;font-weight:400;color:#606266;line-height:22px}.ct .tips[data-v-1a4621fb]{font-size:13px;line-height:1;color:#606266;margin-left:90px;margin-top:8px}.ct .tips[data-v-1a4621fb]:before{content:"*";color:#ff943e;margin-right:3px}[data-v-43be3626] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-43be3626] .el-table__row.hover-row .hover-btn{opacity:1}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.result[data-v-34452bfd]{text-align:center}.result p[data-v-34452bfd]:first-child{color:#303133;font-size:14px;line-height:24px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:24px}.result i[data-v-34452bfd]{font-size:24px;margin-right:8px}.send-preview[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease;opacity:0;visibility:hidden;z-index:1000;position:fixed;width:100%;height:100%;overflow-y:hidden;left:0;top:0}.send-preview.visible[data-v-0ab93ec9]{visibility:visible;opacity:1}.send-preview div.block[data-v-0ab93ec9]{margin:0 auto;z-index:3;position:relative;top:0;height:100%;width:100%}.send-preview div.block img[data-v-0ab93ec9]{width:100%}.send-preview ul[data-v-0ab93ec9]{position:absolute;bottom:10px}.send-preview .content[data-v-0ab93ec9]{height:100%;width:100%;position:absolute;left:0;top:0}.send-preview .content .avatar[data-v-0ab93ec9]{position:absolute;right:75.5px;top:119px}.send-preview .content .avatar[data-v-0ab93ec9] i{font-size:18px;line-height:35px}.send-preview .content .blk[data-v-0ab93ec9]{position:absolute;padding:22px 15px 13px 15px;right:129.5px;top:119px;width:224px;background:#fff;-webkit-box-shadow:0 2px 8px 0 rgba(0,0,0,.1);box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:10px}.send-preview .content .blk .card[data-v-0ab93ec9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.send-preview .content .blk .card i[data-v-0ab93ec9]{position:relative;top:2px}.send-preview .content .blk pre[data-v-0ab93ec9]{margin:15px auto;line-height:18px}.send-preview .bg[data-v-0ab93ec9]{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:block;background:rgba(0,0,0,.5)}.send-preview .btn[data-v-0ab93ec9]{position:absolute;height:80px;width:368px;top:773px;left:63px;background:#fff;overflow:hidden;border-radius:0 0 50px 50px}.send-preview .btn li[data-v-0ab93ec9]{float:left;width:50%;line-height:80px;color:#606266;text-align:center;font-size:18px}.send-preview .btn li.active[data-v-0ab93ec9]{color:#2f54eb}.page[data-v-0ab93ec9]{width:308px;position:absolute;top:98px;left:50%;margin-left:-154px}.page .title[data-v-0ab93ec9]{color:#335782;font-size:16px;margin:16px 0;text-align:center}.page .page-card[data-v-0ab93ec9]{background:#fff;padding:20px;height:650px;border-radius:4px}.page .give-rule[data-v-0ab93ec9]{margin-top:70px}.page .give-rule dd[data-v-0ab93ec9]{text-align:center;color:#2c3038;font-size:18px;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #e6e6e6}.page .give-rule dt[data-v-0ab93ec9]{font-size:14px;line-height:24px}.page .card-content[data-v-0ab93ec9]{-webkit-box-shadow:0 2px 8px 0 rgba(136,148,156,.15);box-shadow:0 2px 8px 0 rgba(136,148,156,.15);overflow:hidden;position:relative;height:70px;padding-left:91px;background:#fff}.page .card-content img.exchange[data-v-0ab93ec9]{width:50px}.page .card-content .dl[data-v-0ab93ec9]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:91px;color:#fff;height:100%;text-align:center;position:absolute;left:0;top:0;background:#3970b5}.page .card-content .dl[data-v-0ab93ec9]:after{content:"";width:6px;height:100%;background:url([object Module]) repeat-y;position:absolute;left:-3px;top:0}.page .card-content .dl p[data-v-0ab93ec9]{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:28px;font-weight:700;line-height:100px;height:100px;text-align:center}.page .card-content .dl p span[data-v-0ab93ec9]{margin-right:2px;font-size:18px}.page .card-d[data-v-0ab93ec9]{padding:10px 10px 5px 10px;position:relative;height:100%}.page .card-d-title[data-v-0ab93ec9]{height:18px;font-size:13px;font-weight:500;color:#2c3038;line-height:18px;margin-bottom:11px;position:relative;margin-top:2px;padding-left:48px}.page .card-d-title span[data-v-0ab93ec9]{position:absolute;left:-20px;bottom:-7px;width:84px;padding:2px 0 2px;border-radius:1px;text-align:center;color:#fff;line-height:28px;font-weight:400;font-size:20px;display:inline-block;-webkit-transform:scale(.5);transform:scale(.5)}.page .card-d-time[data-v-0ab93ec9]{height:15px;font-size:12px;font-weight:400;color:#2c3038;line-height:15px}.page .card-d-option[data-v-0ab93ec9]{width:calc(200% - 48px);position:absolute;bottom:0;left:-40%;font-size:22px;font-weight:400;color:#2c3038;line-height:32px;-webkit-transform:scale(.5);transform:scale(.5);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.page .card-d-option img[data-v-0ab93ec9]{width:24px;height:24px}.page .card-d-option .right[data-v-0ab93ec9]{margin-left:auto}.slide-fade-enter-active[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease}.slide-fade-leave-active[data-v-0ab93ec9]{-webkit-transition:all .8s cubic-bezier(1,.5,.8,1);transition:all .8s cubic-bezier(1,.5,.8,1)}.slide-fade-enter[data-v-0ab93ec9],.slide-fade-leave-to[data-v-0ab93ec9]{-webkit-transform:translateX(10px);transform:translateX(10px);opacity:0}.cardForm[data-v-12c87747]{padding:30px 20px}.cardForm .w165[data-v-12c87747]{width:165px!important}.cardForm .w265[data-v-12c87747]{width:265px!important}.cardForm .tips[data-v-12c87747]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-12c87747]{margin:20px auto 48px}.cardForm[data-v-12c87747] .el-form .el-input-number .el-input,.cardForm[data-v-12c87747] .el-form .el-select .el-input{width:100%}.cardForm[data-v-12c87747] .el-form .wInput352{width:352px}.w500[data-v-12c87747] input,.w500[data-v-12c87747] textarea{width:500px}.info .row[data-v-440cdf32] .el-form-item{margin-bottom:12px}.w500[data-v-440cdf32] input,.w500[data-v-440cdf32] textarea{width:500px}.card-info[data-v-440cdf32]{padding:24px 20px;position:relative}.card-info .title[data-v-440cdf32]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-440cdf32] .btn-area{display:none}.card-info[data-v-440cdf32] .el-form-item__content{color:#303133}.card-info[data-v-440cdf32] .el-form .el-input-number .el-input,.card-info[data-v-440cdf32] .el-form .el-select .el-input{width:100%}.card-info[data-v-440cdf32] .el-form .dm-input,.card-info[data-v-440cdf32] .el-form .el-input,.card-info[data-v-440cdf32] .el-form .el-input-number,.card-info[data-v-440cdf32] .el-form .el-select,.card-info[data-v-440cdf32] .el-form .el-textarea{width:352px}.cardSelect[data-v-1324332a] .el-button{width:350px!important}.cardSelect[data-v-1324332a] .reveal .card img.flag{display:none}[data-v-1324332a] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-1324332a] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/js/chunk-0add7e94.7a1ef3bb.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0add7e94"],{"9fdf":function(t,e,a){"use strict";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("div",{staticClass:"pb20 clearfix flex-center"},[a("el-input",{staticClass:"mr10 w220",attrs:{clearable:"",placeholder:"请输入福利id"},on:{change:t.refresh},model:{value:t.listParams.search,callback:function(e){t.$set(t.listParams,"search",e)},expression:"listParams.search"}},[a("i",{staticClass:"el-input__icon el-icon-search",attrs:{slot:"prefix"},slot:"prefix"})]),a("el-input",{staticClass:"mr10 w220",attrs:{clearable:"",placeholder:"请输入操作人姓名搜索"},on:{change:t.refresh},model:{value:t.listParams.creatorName,callback:function(e){t.$set(t.listParams,"creatorName",e)},expression:"listParams.creatorName"}},[a("i",{staticClass:"el-input__icon el-icon-search",attrs:{slot:"prefix"},slot:"prefix"})]),a("el-date-picker",{staticClass:"w300 mr10",attrs:{type:"daterange","range-separator":"~","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:t.refresh},model:{value:t.dateTime,callback:function(e){t.dateTime=e},expression:"dateTime"}})],1),a("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[a("el-table-column",{attrs:{label:"上传时间",prop:"createTime","min-width":"200px"},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":"180px"}}),a("el-table-column",{attrs:{prop:"fileName",label:"文件名称","min-width":"200px"}}),a("el-table-column",{attrs:{prop:"giftName",label:"福利名称","min-width":"150px"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.goDetail(e.row)}}},[t._v(t._s(e.row.giftName||"--"))])]}}])}),a("el-table-column",{attrs:{label:"上传结果","min-width":"180px"},scopedSlots:t._u([{key:"default",fn:function(e){return[1===e.row.statusFlag?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("条\n ")]):0===e.row.statusFlag?a("div",[t._v("上传中")]):a("div",[t._v("上传失败")])]}}])}),a("el-table-column",{attrs:{label:"操作",width:"130px"},scopedSlots:t._u([{key:"default",fn:function(e){return[2===e.row.statusFlag?a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.uploadReview(e.row)}}},[t._v("重新上传")]):t._e(),1===e.row.statusFlag&&0!==e.row.errorNum?a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.showDetail(e.row)}}},[t._v("查看失败原因")]):t._e()]}}])})],1),a("div",{staticClass:"clearfix"},[t.tableList.length?a("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),a("detail",{attrs:{"dialog-visible":t.dialogVisible,id:t.uploadLogId},on:{"update:dialogVisible":function(e){t.dialogVisible=e},"update:dialog-visible":function(e){t.dialogVisible=e}}})],1)},r=[],s=(a("c5f6"),a("fab6")),l=a("ed08"),n=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("el-dialog",{attrs:{title:"查看详情",visible:t.dialogVisible,width:"500px"},on:{"update:visible":function(e){t.dialogVisible=e},closed:t.closed}},[a("div",[a("el-table",{staticClass:"el-table-list-mini-empty",attrs:{"tooltip-effect":"dark",data:t.tableList,"max-height":"450px"}},[a("el-table-column",{attrs:{prop:"errorMsg",label:"错误信息"}})],1),a("div",{staticClass:"clearfix"},[t.tableList.length?a("dm-pagination",{staticClass:"fr mb0",attrs:{small:"",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),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:t.closed}},[t._v("关 闭")])],1)])},o=[],c=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),u=a("2934");function d(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 g(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?d(Object(a),!0).forEach((function(e){Object(c["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):d(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p=u["a"].virtualErrorPage,h={name:"StockUploadRecordDetail",mixins:[s["c"]],props:{id:{type:[String,Number],required:!0},dialogVisible:{type:Boolean,default:!1}},data:function(){return{loading:!0,listParams:{id:"",key:"",currentPage:1,pageSize:20},total:0,tableList:[]}},methods:{closed:function(){this.$emit("update:dialogVisible",!1),this.loading=!1,this.tableList=[],this.listParams.currentPage=1,this.listParams.pageSize=20},getTableList:function(){var t=this,e=g(g({},this.listParams),{},{id:this.id,pageNum:this.listParams.currentPage});this.loading=!0,p(e).then((function(e){t.loading=!1;var a=e.result;t.tableList=a.result||[],t.total=a.totalCount,0===t.tableList.length&&1!==t.listParams.currentPage&&(t.listParams.currentPage-=1,t.getTableList())})).catch((function(){t.loading=!1}))}},watch:{dialogVisible:function(t){t&&this.getTableList()}}},m=h,f=a("2877"),b=Object(f["a"])(m,n,o,!1,null,null,null),v=b.exports,P=u["a"].virtualUploadLog,w={name:"StockRecord",components:{Detail:v},mixins:[s["c"],s["a"]],props:{type:{type:[Number,String],required:!0}},data:function(){return{loading:!1,dateTime:[new Date-6048e5,new Date],listParams:{source:this.type,search:"",creatorName:"",startTime:"",endTime:"",currentPage:1,pageSize:20},listParams2:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,totalError:"",uploadLogId:""}},mounted:function(){this.getTableList()},methods:{listTime:l["g"],getTableList:function(){var t=this;this.loading||(this.formatterTimeFunc("startTime","endTime","yyyy-MM-dd","dateTime"),this.loading=!0,P(this.listParams).then((function(e){t.loading=!1;var a=e.result;t.tableList=a.result||[],t.total=a.totalCount,0===t.tableList.length&&1!==t.listParams.currentPage&&(t.listParams.currentPage-=1,t.getTableList())})).finally((function(){t.loading=!1})))},showDetail:function(t){var e=t.uploadLogId;this.uploadLogId=e,this.dialogVisible=!0},goDetail:function(t){0===t.source?this.$router.push({path:"/gift-manage/virtual-gift-detail",query:{giftId:t.giftId}}):this.$router.push({path:"/gic-card/info",query:{id:t.giftId}})},uploadReview:function(t){0===t.source?this.$router.push({path:"/gift-manage/virtual-gift",query:{giftId:t.giftId}}):this.$router.push({path:"/gic-card/list",query:{couponId:t.giftId}})}}},y=w,_=Object(f["a"])(y,i,r,!1,null,null,null);e["a"]=_.exports},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("stock-record",{attrs:{type:"0"}})},r=[],s=a("9fdf"),l={name:"StockRecord",components:{stockRecord:s["a"]},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"礼品管理"},{breadName:"库存上传记录"}])}},n=l,o=a("2877"),c=Object(o["a"])(n,i,r,!1,null,null,null);e["default"]=c.exports},fab6:function(t,e,a){"use strict";a.d(e,"c",(function(){return r})),a.d(e,"a",(function(){return s})),a.d(e,"b",(function(){return l}));var i=a("ed08"),r={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()}}},s={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",r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[r]?(this.listParams[t]=Object(i["e"])(this[r][0],a),this.listParams[e]=Object(i["e"])(this[r][1],a)):this.listParams[t]=this.listParams[e]=""}}},l={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-34bff564.a2c6e710.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.e4b32eb2.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.7edc7c4e.js deleted 100644 → 0
(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.e768622d.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return l}));a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function c(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",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"},n={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};p=Object(i["a"])(p,o["f"]),n=Object(i["a"])(n,o["f"]),e["a"]=c(c({},p),n);o["c"].api,o["b"];var l=o["c"].api+o["f"]+"/export-pickup-store-excel"},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),c=a("cdc8");function p(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?p(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):p(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var l=c["a"].updateConfig,d=c["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,l({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=n(n({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file
dist/js/chunk-vendors.4a0b36ab.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.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.c971fc1e.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.d709790b.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/api/common.js
......@@ -21,6 +21,11 @@ let o2 = {
},
getStockActivityStatistics: '/stock/activity-statistics', // 库存记录-统计记录
getRelationId: '/gift/get-gift-id', // 随机返回一个ID
virtualUploadLog: {
url: '/gift/vir-card-log-page',
method: 'post',
}, // 库存上传记录
virtualErrorPage: '/gift/vir-card-error-page', // 库存上传记录-上传错误日志分页
};
// other
......
src/api/gift.js
......@@ -44,10 +44,7 @@ let realGift = {
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'
......@@ -75,7 +72,6 @@ let realGift = {
}, // 保存操作人权限数据
getOperatorList: '/auth/operator-list', // 查询操作人权限回显数据
virtualCostUpdate: '/gift/vir-cost-update', // 虚拟礼品调整库存
virtualErrorPage: '/gift/vir-card-error-page', // 虚拟礼品卡密上传错误日志分页
};
// 通用配置
......
src/components/layout/layout.vue
......@@ -88,10 +88,6 @@ export default {
// }
this.$store.commit('setCurrentSubApp', areaId);
},
// 设置默认子应用
// setDefaultApp({ areaId }) {
// this.$store.commit('setDefaultSubAppId', areaId);
// },
async init() {
const moduleCode = this.moduleCode;
......
src/components/stock-upload-record/detail.vue 0 → 100644
<template>
<el-dialog
title="查看详情"
:visible.sync="dialogVisible"
width="500px"
@closed="closed">
<div>
<el-table
tooltip-effect="dark"
:data="tableList"
max-height="450px"
class="el-table-list-mini-empty">
<el-table-column prop="errorMsg" label="错误信息"></el-table-column>
</el-table>
<div class="clearfix">
<dm-pagination
small
class="fr mb0"
v-if="tableList.length"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listParams.currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="listParams.pageSize"
layout="total, sizes, prev, pager, next"
:total="total"></dm-pagination>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="closed">关 闭</el-button>
</span>
</el-dialog>
</template>
<script>
import fetch from '@/api/common.js';
const { virtualErrorPage } = fetch;
import { page } from '@/mixins/table.js';
export default {
name: 'StockUploadRecordDetail',
mixins: [ page ],
props: {
id: {
type: [ String, Number ],
required: true,
},
dialogVisible: {
type: Boolean,
default: false,
},
},
data() {
return {
loading: true,
listParams: {
id: '',
key: '',
currentPage: 1,
pageSize: 20,
},
total: 0,
tableList: [],
};
},
methods: {
closed() {
this.$emit('update:dialogVisible', false);
this.loading = false;
this.tableList = [];
this.listParams.currentPage = 1;
this.listParams.pageSize = 20;
},
getTableList() {
const params = {
...this.listParams,
id: this.id,
pageNum: this.listParams.currentPage,
};
this.loading = true;
virtualErrorPage(params)
.then((res) => {
this.loading = false;
const data = res.result;
this.tableList = data.result || [];
this.total = data.totalCount;
// 删除至最后一页没数据的情况，页码-1
if (
this.tableList.length === 0 &&
this.listParams.currentPage !== 1
) {
this.listParams.currentPage -= 1;
this.getTableList();
}
})
.catch(() => {
this.loading = false;
});
},
},
watch: {
dialogVisible(val) {
if(val) {
this.getTableList();
}
}
}
};
</script>
src/components/stock-upload-record/index.vue 0 → 100644
<template>
<div class="p20" v-loading="loading">
<div class="pb20 clearfix flex-center">
<el-input
class="mr10 w220"
v-model="listParams.search"
clearable
placeholder="请输入福利id"
@change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-input
class="mr10 w220"
v-model="listParams.creatorName"
clearable
placeholder="请输入操作人姓名搜索"
@change="refresh"><i slot="prefix" class="el-input__icon el-icon-search"></i></el-input>
<el-date-picker
class="w300 mr10"
v-model="dateTime"
type="daterange"
range-separator="~"
start-placeholder="开始日期"
end-placeholder="结束日期"
@change="refresh"></el-date-picker>
</div>
<el-table tooltip-effect="dark" :data="tableList" style="width: 100%">
<el-table-column label="上传时间" prop="createTime" min-width="200px">
<template slot-scope="scope">
<div v-html="listTime(scope.row.createTime)"></div>
</template>
</el-table-column>
<el-table-column
prop="creatorName"
label="操作人"
min-width="180px"></el-table-column>
<el-table-column
prop="fileName"
label="文件名称"
min-width="200px"></el-table-column>
<el-table-column prop="giftName" label="福利名称" min-width="150px">
<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="180px">
<template slot-scope="scope">
<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="操作" width="130px">
<template slot-scope="scope">
<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="showDetail(scope.row)">查看失败原因</el-button>
</template>
</el-table-column>
</el-table>
<div class="clearfix">
<dm-pagination
class="fr mb0"
v-if="tableList.length"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="listParams.currentPage"
:page-sizes="[20, 40, 60, 80]"
:page-size="listParams.pageSize"
layout="total, sizes, prev, pager, next"
:total="total"></dm-pagination>
</div>
<detail :dialog-visible.sync="dialogVisible" :id="uploadLogId"></detail>
</div>
</template>
<script>
import { page, formate } from '@/mixins/table.js';
import { listTime } from '@/utils/index.js';
import Detail from './detail';
import fetch from '@/api/common.js';
const { virtualUploadLog } = fetch;
export default {
name: 'StockRecord',
components: {
Detail,
},
mixins: [ page, formate ],
props: {
type: {
type: [ Number, String ], // 0 礼品 1 卡券
required: true,
},
},
data() {
return {
loading: false,
dateTime: [ new Date() - 7 * 24 * 60 * 60 * 1000, new Date() ],
listParams: {
source: this.type,
search: '',
creatorName: '',
startTime: '',
endTime: '',
currentPage: 1,
pageSize: 20,
},
listParams2: {
currentPage: 1,
pageSize: 20,
},
total: 0,
tableList: [],
dialogVisible: false,
totalError: '',
uploadLogId: '',
};
},
mounted() {
this.getTableList();
},
methods: {
listTime,
getTableList() {
if (this.loading) {
return;
}
this.formatterTimeFunc('startTime', 'endTime', 'yyyy-MM-dd', 'dateTime');
this.loading = true;
virtualUploadLog(this.listParams)
.then((res) => {
this.loading = false;
const data = res.result;
this.tableList = data.result || [];
this.total = data.totalCount;
// 删除至最后一页没数据的情况，页码-1
if (
this.tableList.length === 0 &&
this.listParams.currentPage !== 1
) {
this.listParams.currentPage -= 1;
this.getTableList();
}
})
.finally(() => {
this.loading = false;
});
},
showDetail({ uploadLogId }) {
this.uploadLogId = uploadLogId;
this.dialogVisible = true;
},
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/router/gic-card.js
......@@ -29,6 +29,10 @@ export default [
path: '/gic-card/list'
}
},
{
path: 'stock-upload-list', // 上传设置
component: () => import(/* webpackChunkName: "gic-card" */'@/views/card/gic-card/stock-upload-list.vue'),
},
// 转赠列表
{
path: 'send-list',
......
src/router/other.js
......@@ -77,7 +77,7 @@ export default [
children: [
{
path: 'custom', // 设置
component: () => import('@/views/card/setting/custom.vue'),
component: () => import(/* webpackChunkName: "gic-card" */'@/views/card/setting/custom.vue'),
},
]
}
......
src/views/card/gic-card/card-list.vue
......@@ -18,10 +18,6 @@
<el-option label="已过期" :value="2"></el-option>
<el-option label="已禁用" :value="3"></el-option>
</el-select>
<ul class="toggle-btn">
<li @click="active = 'card'" :class="{ active: active === 'card' }"><i class="iconfont-market4 icon-kapian"></i></li>
<li @click="active = 'list'" :class="{ active: active === 'list' }"><i class="iconfont-market4 icon-liebiao"></i></li>
</ul>
<dm-perm-button type="primary" @click="$router.push('/gic-card/add')" :disabled="$itemPerm($itemCode.gicCardFormAdd)">新建卡券</dm-perm-button>
</div>
<div style="height:20px;width:calc(100% + 40px);position:relative;left:-20px;" class="bg-color mb20"></div>
......@@ -37,20 +33,9 @@
<el-input-number class="hide-right w100" @change="refresh" v-model="listParams.remainedStockBegin" controls-position="right" :precision="0" :min="1" :max="10000" placeholder="请输入" />
<label class="ml5 mr5">-</label>
<el-input-number class="hide-right w100 mrAuto" @change="refresh" v-model="listParams.remainedStockEnd" controls-position="right" :precision="0" :min="listParams.remainedStockBegin" :max="100000" placeholder="请输入" />
<dm-perm-button type="danger" class="specter" v-show="active === 'list'" :disabled="!multipleSelection.length" @click="mutiDel">批量删除</dm-perm-button>
<dm-perm-button type="danger" class="specter" :disabled="!multipleSelection.length" @click="mutiDel">批量删除</dm-perm-button>
</div>
<!-- card -->
<div v-show="active === 'card'" class="card-content clearfix" :style="`max-height:${mainHeight(72 + 47)}px;overflow-y: auto;`">
<card-item @adjust-stock="preAdjustStock" @upload-code="uploadCode" :item="v" v-for="(v, i) in tableList" :key="i" @handler="handler"></card-item>
<div class="el-table__empty-block" v-if="!tableList.length">
<div class="empty-table">
<span class="el-table__empty-text">暂无数据</span>
</div>
</div>
</div>
<!-- list -->
<!-- TODO: minheight -->
<el-table v-show="active === 'list'" tooltip-effect="dark" :data="tableList" style="width:100%" :max-height="mainHeight(52 + 52)" @selection-change="handleSelectionChange">
<el-table tooltip-effect="dark" :data="tableList" style="width:100%" :max-height="mainHeight(52 + 52)" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="卡券信息" min-width="200" fixed="left">
<template slot-scope="scope">
......@@ -118,9 +103,6 @@
<li v-if="[2, 3, 4].includes(scope.row._status)" :class="{ disabled: $itemPerm($itemCode.gicCardGroupBtn) || scope.row.deleteFlag }">
<mk-button @click="handler(8, scope.row)" :option="{ perm: $itemPerm($itemCode.gicCardGroupBtn), deleteFlag: scope.row.deleteFlag, deleteRemark: scope.row.remark }" type="text">领取记录</mk-button>
</li>
<li>
<mk-button @click="handler(8, scope.row)" type="text">领取记录</mk-button>
</li>
</ul>
<el-button type="text" slot="reference">更多<i class="ml5 el-icon-arrow-down"></i></el-button>
</el-popover>
......@@ -144,7 +126,6 @@ import { cardType, cardStatus, mappingCardStatus } from '@/config/mapping/gic-ca
import { mixBeforeRouteLeave } from '@/mixins/mixRoute';
import { formatDateTimeByType } from '@/utils/index';
import { showConfirm } from '@/utils/common';
import cardItem from './module/card-item';
import adjustStock from '@/components/libs/adjust-stock';
import syncStock from './module/sync-stock';
import api from '@/api/gic-card';
......@@ -153,7 +134,6 @@ const { cardList, deleteCard, updateCardStock, disableCard } = api;
export default {
name: 'CardList',
components: {
cardItem,
adjustStock,
syncStock,
importCode,
......@@ -162,7 +142,6 @@ export default {
mixins: [ page, formate, mixBeforeRouteLeave, getMainHeight ],
data() {
return {
active: this.$route.query.active == 'list' ? 'list' : 'card', // card list
loading: false,
cacheRoute: [ '/gic-card/add', '/gic-card/edit', '/gic-card/copy' ],
dateTime: [ , ],
......@@ -406,29 +385,4 @@ export default {
opacity: 1;
}
}
.toggle-btn {
background: white;
overflow: hidden;
margin-right:10px;
border:1px solid rgba(196,198,207,1);
li {
border-right:1px solid rgba(196,198,207,1);
text-align: center;
float: left;
width:32px;
height:30px;
background: white;
border-radius:0px 1px 1px 0px;
color: $gray02;
line-height: 30px;
cursor: pointer;
&.active {
background:rgba(240,245,255,1);
color: $gray01;
}
&:last-child {
border-right: 0px;
}
}
}
</style>
\ No newline at end of file
src/views/card/gic-card/destory-list.vue
......@@ -127,7 +127,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: 'GIC卡券销毁列表' } ]);
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券销毁列表' } ]);
},
mounted() {
this.getTableList();
......
src/views/card/gic-card/module/card-item.vue
<template>
<!-- @mouseover="show = true" @mouseout="show = false" -->
<!-- 卡片样式 于2.22福利中心-卡券ui评审一致决定去掉 -->
<div class="card">
<div class="card-head" :style="`background: ${ item._status === 3 || item.deleteFlag == 1 ? '#c0c4cc' : item.color }`">
<p class="title" p-key="couponId" :title="item.couponId">
......
src/views/card/gic-card/send-list.vue
......@@ -105,7 +105,7 @@ export default {
};
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '卡券日志' }, { breadName: '转赠记录' } ]);
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券' }, { breadName: '转赠记录' } ]);
},
mounted() {
this.getTableList();
......
src/views/card/gic-card/stock-upload-list.vue 0 → 100644
<template>
<stock-record type="1"></stock-record>
</template>
<script>
import stockRecord from '@/components/stock-upload-record/index.vue';
export default {
name: 'StockUploadList',
components: {
stockRecord
},
created() {
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券', breadPath: '/gic-card/list' }, { breadName: '库存上传记录' } ]);
}
};
</script>
src/views/gift-manage/module/update-real-stock.vue
......@@ -32,7 +32,7 @@
</el-popover>
</template>
<template slot-scope="scope">
<el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px">
<el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px" @change="changeType">
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
......@@ -89,8 +89,8 @@ export default {
spanArr: [], // 用于存放每一行记录的合并数
// costChangeObj: [], // 用于存放批量修改后的数据
banthStock: '',
stockType: 0,
banthStockType: 0,
stockType: 1,
banthStockType: 1,
updateList: [],
textarea: '',
giftId: '',
......@@ -169,25 +169,36 @@ export default {
});
console.log('获取成本数据');
},
changeType(value){
console.log(value);
},
submitProNanme() {
if(this.loading) return;
let params = {
giftId: this.stockData.id,
updateList: this.updateList,
remark: this.textarea
};
this.loading = true;
realStockUpdate(params).then(res =>{
if(res.code === '0000'){
this.dialogVisible = false;
setInterval(() => {
this.$emit('closeUpdateStock');
}, 10);
this.$message.success('修改成功');
}else{
this.$message.error(res.message);
}
}).finally(() => this.loading = false);
let totalStock = 0;
this.updateList.forEach((item) =>{
totalStock = Number(totalStock) + Number(item.stock);
});
if(!totalStock){
this.$message.error('库存更改不可为0');
}else{
let params = {
giftId: this.stockData.id,
updateList: this.updateList,
remark: this.textarea
};
this.loading = true;
realStockUpdate(params).then(res =>{
if(res.code === '0000'){
this.dialogVisible = false;
setInterval(() => {
this.$emit('closeUpdateStock');
}, 10);
this.$message.success('修改成功');
}else{
this.$message.error(res.message);
}
}).finally(() => this.loading = false);
}
},
// 取消修改
cancelSubmit() {
......@@ -259,7 +270,7 @@ export default {
remainedStock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].remainedStock : '',
stockStatus: true,
giftSkuCostPriceStatus: true,
stockType: 0,
stockType: 1,
stageStock: ''
};
this.stockObj[item.mapId] = Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '';
......@@ -273,7 +284,7 @@ export default {
giftSkuCostPriceStatus: true,
giftSkuId: '',
remainedStock: '',
stockType: 0,
stockType: 1,
stageStock: ''
};
}
......
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