Skip to content

W
welfare
Commit af73c709 by 萱草
Options

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

# Conflicts:
#	dist/index.html
#	dist/js/chunk-1f8b8446.e802b9da.js
#	dist/js/chunk-53f4695c.4126a972.js
#	dist/js/chunk-53f4695c.5dc4a5db.js
#	dist/js/chunk-7a226a22.6a87bfd1.js
#	dist/js/chunk-7f083f49.643e2d35.js
#	dist/js/chunk-7f6e53d4.910fe896.js
parents 11ff6553 e02bd9b0
Showing with 83 additions and 87 deletions
dist/css/chunk-1f8b8446.af6cce8b.css deleted 100644 → 0
.step-text[data-v-7643a70d]{color:#000;font-size:14px}.dash-style[data-v-7643a70d]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-7643a70d]{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-7643a70d]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-7643a70d]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-7643a70d]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-7643a70d]{padding:0}.w-630[data-v-7643a70d]{width:630px}.mb56[data-v-7643a70d]{margin-bottom:56px}.from-content[data-v-7643a70d]{position:relative}.from-content .demo-ruleForm .form-section[data-v-7643a70d]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-7643a70d]{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-7643a70d]: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-7643a70d]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-7643a70d]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-7643a70d]{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-7643a70d]{margin-top:12px}.from-content .anchor-link[data-v-7643a70d]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-7643a70d]{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-7643a70d]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-7643a70d]:hover{color:#2f54ed}.ml20[data-v-7643a70d]{margin-left:20px}.mr10[data-v-7643a70d]{margin-right:10px}.tips-content[data-v-7643a70d]{position:absolute;left:-4px;top:6px}.store-tips[data-v-7643a70d]{width:200px;position:absolute;left:-10px}.underline[data-v-7643a70d]{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/css/chunk-53f39170.c9183c7e.css 0 → 100644
.step-text[data-v-123180e0]{color:#000;font-size:14px}.dash-style[data-v-123180e0]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-123180e0]{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-123180e0]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-123180e0]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-123180e0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-123180e0]{padding:0}.w-630[data-v-123180e0]{width:630px}.mb56[data-v-123180e0]{margin-bottom:56px}.from-content[data-v-123180e0]{position:relative}.from-content .demo-ruleForm .form-section[data-v-123180e0]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-123180e0]{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-123180e0]: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-123180e0]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-123180e0]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-123180e0]{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-123180e0]{margin-top:12px}.from-content .anchor-link[data-v-123180e0]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-123180e0]{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-123180e0]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-123180e0]:hover{color:#2f54ed}.ml20[data-v-123180e0]{margin-left:20px}.mr10[data-v-123180e0]{margin-right:10px}.tips-content[data-v-123180e0]{position:absolute;left:-4px;top:6px}.store-tips[data-v-123180e0]{width:200px;position:absolute;left:-10px}.underline[data-v-123180e0]{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/css/chunk-7f083f49.6bc0e84f.css deleted 100644 → 0
.tab-top[data-v-20ef2467]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-20ef2467]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-20ef2467]{height:60px}.table-content .img-text img[data-v-20ef2467]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-20ef2467]{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-20ef2467]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-20ef2467]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-20ef2467]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-20ef2467]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-20ef2467]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-20ef2467]:hover{color:#2f54ed}.undeline-dash[data-v-20ef2467]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-20ef2467]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
dist/css/chunk-edf46648.be3ed50b.css 0 → 100644
.tab-top[data-v-3796b4e8]{height:32px;margin:20px 20px 0 20px}.table-content[data-v-3796b4e8]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-3796b4e8]{height:60px}.table-content .img-text img[data-v-3796b4e8]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-3796b4e8]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-3796b4e8]{color:#606266;line-height:18px;font-size:14px;margin-bottom:10px}.table-content .img-text .text .goods-code[data-v-3796b4e8]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text :hover .el-icon-edit-outline[data-v-3796b4e8]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-3796b4e8]:hover{color:#2f54ed}.table-content .stock-box:hover .el-icon-edit-outline[data-v-3796b4e8]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-3796b4e8]:hover{color:#2f54ed}.undeline-dash[data-v-3796b4e8]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-3796b4e8]{display:inline-block;line-height:32px}.damolish .el-tooltip__popper{width:240px}
\ No newline at end of file
dist/js/chunk-7f083f49.643e2d35.js deleted 100644 → 0
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-7f083f49"],{"924b":function(t,e,a){"use strict";a("ba4d")},ab03:function(t,e,a){},ba4d:function(t,e,a){},bf73:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("div",{staticClass:"tab-top"},[a("el-input",{staticClass:"mr10 w350",attrs:{placeholder:t.placeholderText,clearable:""},on:{clear:t.getSearchList},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getSearchList(e)}},model:{value:t.search,callback:function(e){t.search=e},expression:"search"}},[a("el-select",{staticStyle:{width:"140px"},attrs:{slot:"prepend",placeholder:"礼品名称"},on:{change:t.handleChangeType},slot:"prepend",model:{value:t.searchType,callback:function(e){t.searchType=e},expression:"searchType"}},[a("el-option",{attrs:{label:"礼品名称",value:1}}),a("el-option",{attrs:{label:"礼品编码",value:2}}),a("el-option",{attrs:{label:"福利id",value:3}})],1)],1),a("el-input",{staticClass:"mr10 w220",attrs:{placeholder:"请输入操作人姓名搜索","prefix-icon":"el-icon-search",clearable:""},on:{clear:t.getSearchList},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getSearchList(e)}},model:{value:t.creatorName,callback:function(e){t.creatorName=e},expression:"creatorName"}}),a("el-date-picker",{attrs:{type:"daterange",align:"right","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:t.changeTime},model:{value:t.timeValue,callback:function(e){t.timeValue=e},expression:"timeValue"}})],1),a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"table-content"},[a("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:t.tableData}},[a("el-table-column",{attrs:{label:"上传时间",prop:"createTime",width:"300px"}}),a("el-table-column",{attrs:{prop:"creatorName",label:"操作人","min-width":"150px"}}),a("el-table-column",{attrs:{prop:"fileName",label:"文件名称","min-width":"150px"}}),a("el-table-column",{attrs:{prop:"giftName",label:"福利名称","min-width":"120px"}}),a("el-table-column",{attrs:{label:"上传结果","min-width":"150px"},scopedSlots:t._u([{key:"default",fn:function(e){return[0===e.row.statusFlag?a("div",[t._v("处理中")]):a("div",[t._v("\n 成功"),a("span",{staticClass:"blue"},[t._v(t._s(e.row.success))]),t._v("条，失败"),a("span",{staticClass:"danger-color"},[t._v(t._s(e.row.fail))]),t._v("条，"),a("el-button",{attrs:{type:"text"},on:{click:t.checkDetail}},[t._v("查看详情")])],1)]}}])})],1),a("div",{directives:[{name:"show",rawName:"v-show",value:t.total>0,expression:"total > 0"}],staticClass:"pagination-conteiner",staticStyle:{background:"#fff"}},[a("div",{staticClass:"pagination"},[0!=t.total?a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[20,40,60,80],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange,"update:currentPage":function(e){t.currentPage=e},"update:current-page":function(e){t.currentPage=e}}}):t._e()],1)])],1),a("el-dialog",{attrs:{title:"查看详情",visible:t.dialogVisible,width:"30%","before-close":t.handleClose},on:{"update:visible":function(e){t.dialogVisible=e}}},[a("span",[t._v("这是一段信息")]),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(e){t.dialogVisible=!1}}},[t._v("取 消")]),a("el-button",{attrs:{type:"primary"},on:{click:function(e){t.dialogVisible=!1}}},[t._v("确 定")])],1)])],1)},s=[],r=(a("386d"),a("fab6")),o=a("ed08"),l=a("cdc8"),n=l["a"].virtualUploadLog,c={components:{},data:function(){return{bread:[{breadName:"礼品管理"},{breadName:"库存上传记录"}],formatDateTimeByType:o["e"],mixins:[r["c"],r["a"]],proType:"",status:"",batchOperate:"",total:0,sortOrder:"",sortColumn:"",tableData:[{createTime:"1610693597000",statusFlag:0,creatorName:"超级管理员",fileName:"我是文件啦啦啦",giftName:"年终福利",success:"2",fail:"1",uploadLogId:"111111"},{createTime:"1610693597000",statusFlag:1,creatorName:"小熊饼干",fileName:"我是文件小魔仙",giftName:"过年啦",success:"2",fail:"1",uploadLogId:"111111"},{createTime:"1610693597000",statusFlag:2,creatorName:"纯甄牛奶",fileName:"我是文件小哪吒",giftName:"放鞭炮",success:"2",fail:"1",uploadLogId:"111111"}],loading:!1,search:"",giftId:"",giftName:"",giftNo:"",creatorName:"",startTime:"",endTime:"",currentPage:1,pageSize:20,searchType:1,placeholderText:"请输入关键词搜索",isShow:!1,timeValue:[new Date-6048e5,(new Date).valueOf()],dialogVisible:!1}},created:function(){this.$emit("updateBread",this.bread),this.$emit("showAside",!0),this.init()},methods:{init:function(){this.getTableList()},getSearchList:function(){this.pageNum=1,this.getTableList()},changeTime:function(){this.timeValue?(this.startTime=this.formatDateTimeByType(this.timeValue[0],"yyyy-MM-dd"),this.endTime=this.formatDateTimeByType(this.timeValue[1],"yyyy-MM-dd")):(this.startTime="",this.endTime=""),this.currentPage=1,this.pageSize=20,this.getTableList()},handleChangeType:function(){1===this.searchType?(this.placeholderText="请输入礼品名称",this.giftName=this.search):2===this.searchType?(this.placeholderText="请输入礼品编码",this.giftNo=this.search):3===this.searchType&&(this.placeholderText="福利id",this.giftId=this.search)},getTableList:function(){var t=this,e={giftNo:this.giftNo,giftName:this.giftName,giftId:this.giftId,creatorName:this.creatorName,pageNum:this.currentPage,pageSize:this.pageSize,startTime:this.startTime,endTime:this.endTime};n(e).then((function(e){t.tableData=e.result}))},checkDetail:function(){this.dialogVisible=!0}}},d=c,p=(a("ef6a"),a("924b"),a("2877")),u=Object(p["a"])(d,i,s,!1,null,"20ef2467",null);e["default"]=u.exports},cdc8:function(t,e,a){"use strict";a("8e6e"),a("ac6a"),a("456d");var i=a("ade3"),s=a("71f6"),r=a("f121");function o(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,i)}return a}function l(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?o(Object(a),!0).forEach((function(e){Object(i["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):o(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var n={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",useFormData:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},c={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}}};n=Object(s["a"])(n,r["f"]),c=Object(s["a"])(c,r["f"]),e["a"]=l(l({},n),c);r["c"].api,r["b"]},ef6a:function(t,e,a){"use strict";a("ab03")},fab6:function(t,e,a){"use strict";a.d(e,"c",(function(){return s})),a.d(e,"a",(function(){return r})),a.d(e,"b",(function(){return o}));var i=a("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(i["e"])(this[s][0],a),this.listParams[e]=Object(i["e"])(this[s][1],a)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
dist/js/chunk-edf46648.c7cc70b5.js 0 → 100644
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-edf46648"],{"2ebe":function(t,e,a){},"8fcb":function(t,e,a){"use strict";a("2ebe")},"924b":function(t,e,a){"use strict";a("ba4d")},ba4d:function(t,e,a){},bf73:function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("div",{staticClass:"tab-top"},[a("el-input",{staticClass:"mr10 w350",attrs:{placeholder:t.placeholderText,clearable:""},on:{clear:t.getSearchList},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getSearchList(e)}},model:{value:t.search,callback:function(e){t.search=e},expression:"search"}},[a("el-select",{staticStyle:{width:"140px"},attrs:{slot:"prepend",placeholder:"礼品名称"},on:{change:t.handleChangeType},slot:"prepend",model:{value:t.searchType,callback:function(e){t.searchType=e},expression:"searchType"}},[a("el-option",{attrs:{label:"礼品名称",value:1}}),a("el-option",{attrs:{label:"礼品编码",value:2}}),a("el-option",{attrs:{label:"福利id",value:3}})],1)],1),a("el-input",{staticClass:"mr10 w220",attrs:{placeholder:"请输入操作人姓名搜索","prefix-icon":"el-icon-search",clearable:""},on:{clear:t.getSearchList},nativeOn:{keyup:function(e){return!e.type.indexOf("key")&&t._k(e.keyCode,"enter",13,e.key,"Enter")?null:t.getSearchList(e)}},model:{value:t.creatorName,callback:function(e){t.creatorName=e},expression:"creatorName"}}),a("el-date-picker",{attrs:{type:"daterange",align:"right","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期"},on:{change:t.changeTime},model:{value:t.timeValue,callback:function(e){t.timeValue=e},expression:"timeValue"}})],1),a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"table-content"},[a("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:t.tableData}},[a("el-table-column",{attrs:{label:"上传时间",prop:"createTime",width:"300px"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("div",{domProps:{innerHTML:t._s(t.listTime(e.row.createTime))}})]}}])}),a("el-table-column",{attrs:{prop:"creatorName",label:"操作人","min-width":"150px"}}),a("el-table-column",{attrs:{prop:"fileName",label:"文件名称","min-width":"150px"}}),a("el-table-column",{attrs:{prop:"giftName",label:"福利名称","min-width":"120px"}}),a("el-table-column",{attrs:{label:"上传结果","min-width":"150px"},scopedSlots:t._u([{key:"default",fn:function(e){return[0===e.row.statusFlag?a("div",[0===e.row.progress?a("span",[t._v("上传中")]):a("span",[t._v("上传失败")])]):a("div",[t._v("\n 成功"),a("span",{staticClass:"blue"},[t._v(t._s(e.row.successNum))]),t._v("条，失败"),a("span",{staticClass:"danger-color"},[t._v(t._s(e.row.errorNum))]),t._v("条，"),a("el-button",{attrs:{type:"text"},on:{click:t.checkDetail}},[t._v("查看详情")])],1)]}}])})],1),a("div",{directives:[{name:"show",rawName:"v-show",value:t.total>0,expression:"total > 0"}],staticClass:"pagination-conteiner",staticStyle:{background:"#fff"}},[a("div",{staticClass:"pagination"},[0!=t.total?a("dm-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[20,40,60,80],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange,"update:currentPage":function(e){t.currentPage=e},"update:current-page":function(e){t.currentPage=e}}}):t._e()],1)])],1),a("el-dialog",{attrs:{title:"查看详情",visible:t.dialogVisible,width:"30%","before-close":t.handleClose},on:{"update:visible":function(e){t.dialogVisible=e}}},[a("span",[t._v("这是一段信息")]),a("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[a("el-button",{on:{click:function(e){t.dialogVisible=!1}}},[t._v("取 消")]),a("el-button",{attrs:{type:"primary"},on:{click:function(e){t.dialogVisible=!1}}},[t._v("确 定")])],1)])],1)},s=[],r=(a("386d"),a("fab6")),o=a("ed08"),n=a("cdc8"),l=n["a"].virtualUploadLog,c={components:{},data:function(){return{bread:[{breadName:"礼品管理"},{breadName:"库存上传记录"}],formatDateTimeByType:o["e"],listTime:o["g"],mixins:[r["c"],r["a"]],proType:"",status:"",batchOperate:"",total:0,sortOrder:"",sortColumn:"",tableData:[],loading:!1,search:"",giftId:"",giftName:"",giftNo:"",creatorName:"",startTime:"",endTime:"",currentPage:1,pageSize:20,searchType:1,placeholderText:"请输入关键词搜索",isShow:!1,timeValue:[new Date-6048e5,(new Date).valueOf()],dialogVisible:!1}},created:function(){this.$emit("updateBread",this.bread),this.$emit("showAside",!0),this.init()},methods:{init:function(){this.getTableList()},getSearchList:function(){this.pageNum=1,this.getTableList()},changeTime:function(){this.timeValue?(this.startTime=this.formatDateTimeByType(this.timeValue[0],"yyyy-MM-dd"),this.endTime=this.formatDateTimeByType(this.timeValue[1],"yyyy-MM-dd")):(this.startTime="",this.endTime=""),this.currentPage=1,this.pageSize=20,this.getTableList()},handleChangeType:function(){1===this.searchType?(this.placeholderText="请输入礼品名称",this.giftName=this.search):2===this.searchType?(this.placeholderText="请输入礼品编码",this.giftNo=this.search):3===this.searchType&&(this.placeholderText="福利id",this.giftId=this.search)},getTableList:function(){var t=this,e={giftNo:this.giftNo,giftName:this.giftName,giftId:this.giftId,creatorName:this.creatorName,pageNum:this.currentPage,pageSize:this.pageSize,startTime:this.startTime,endTime:this.endTime};l(e).then((function(e){t.tableData=e.result.result}))},checkDetail:function(){this.dialogVisible=!0}}},d=c,p=(a("8fcb"),a("924b"),a("2877")),u=Object(p["a"])(d,i,s,!1,null,"3796b4e8",null);e["default"]=u.exports},cdc8:function(t,e,a){"use strict";a("8e6e"),a("ac6a"),a("456d");var i=a("ade3"),s=a("71f6"),r=a("f121");function o(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,i)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?o(Object(a),!0).forEach((function(e){Object(i["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):o(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var l={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",virtualUploadLog:{url:"/gift/vir-card-log-page",method:"post"},batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",useFormData:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},c={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}}};l=Object(s["a"])(l,r["f"]),c=Object(s["a"])(c,r["f"]),e["a"]=n(n({},l),c);r["c"].api,r["b"]},fab6:function(t,e,a){"use strict";a.d(e,"c",(function(){return s})),a.d(e,"a",(function(){return r})),a.d(e,"b",(function(){return o}));var i=a("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(i["e"])(this[s][0],a),this.listParams[e]=Object(i["e"])(this[s][1],a)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file
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.a6adec24.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/module/update-real-stock.vue
......@@ -17,8 +17,8 @@
<el-popover placement="top" trigger="click">
<div>
<el-select v-model="banthStockType" style="width:100px">
<el-option label="增加" :value="0"></el-option>
<el-option label="减少" :value="1"></el-option>
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="banthStock" width="140" style="margin-left:-2px;" controls-position="right" precision="2" :min="0" :max="999999.99"></dm-input-number>
</div>
......@@ -33,8 +33,8 @@
</template>
<template slot-scope="scope">
<el-select v-model="skuSellObj[scope.row.mapId].stockType" style="width:100px">
<el-option label="增加" :value="0"></el-option>
<el-option label="减少" :value="1"></el-option>
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="skuSellObj[scope.row.mapId].stageStock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].stageStock, skuSellObj[scope.row.mapId].stockType)" precision="2" :min="0" :max="999999.99"></dm-input-number>
</template>
......@@ -45,8 +45,8 @@
<el-form-item label="可占库存" required>
<template>
<el-select v-model="stockType" style="width:100px;">
<el-option label="增加" :value="0"></el-option>
<el-option label="减少" :value="1"></el-option>
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="stock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(giftSkuId, stock, stockType)" precision="2" :min="0" :max="999999.99"></dm-input-number>
</template>
......
src/views/gift-manage/real-gift-detail.vue
......@@ -210,7 +210,6 @@
<div class="form-section mb56">
<h3>权限设置</h3>
<el-form-item label="操作人权限" required>
{{goodsForm.operAuthType}}
<dm-acc-group-select :etype.sync="goodsForm.operAuthType" :group-ids.sync="goodsForm.operAuthPre" @change="updateGroupList" />
</el-form-item>
</div>
......@@ -240,9 +239,8 @@ const {
giftUpdate,
giftSave,
getGiftId,
getGiftShopList,
getOperatorList } = api;
// const { giftStandardList, giftStandardNew, giftStandardValueList, giftStandardValueNew, giftGet } = api;
// getOperatorList,
getGiftShopList } = api;
export default {
components: {
// importCoupon
......@@ -429,7 +427,7 @@ export default {
this.getMess();
this.isEdit = true;
this.getShopList();
this.getOperatorList();
// this.getOperatorList();
}else{
this.getGiftId();
}
......@@ -449,7 +447,6 @@ export default {
},
// 表头添加必填标识符
starAdd(obj){
console.log(obj);
if(obj.column.label === '可占库存' || obj.column.label === '成本') {
return 'star';
}
......@@ -501,20 +498,22 @@ export default {
});
},
// 操作人权限数据回显
getOperatorList(){
let params = {
typeEnum: 'WELFARE',
relationId: this.giftId
};
getOperatorList(params).then(res =>{
if(res.code === '0000'){
console.log(res.result);
this.goodsForm.operAuthPre = res.result;
}else{
this.$message.error(res.message);
}
});
},
// getOperatorList(){
// let params = {
// typeEnum: 'WELFARE',
// relationId: this.giftId
// };
// getOperatorList(params).then(res =>{
// if(res.code === '0000'){
// console.log(res.result);
// // this.goodsForm.operAuthPre = res.result;
// console.log(res.result);
// }
// // else{
// // this.$message.error(res.message);
// // }
// });
// },
// 保存操作人权限数据
// operatorSave(){
// let params = {
......@@ -543,6 +542,7 @@ export default {
this.goodsForm.spuList[0].stock = resResult.stock; // 库存
this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ '1', '2' ] : (resResult.stockUseType == 1 ? [ '1' ] : [ '0' ]); // 库存消耗方式
this.goodsForm.deliveryType = resResult.deliveryType;
if(this.goodsForm.deliveryType == '1,2'){
......@@ -1228,6 +1228,8 @@ export default {
} else {
skuList = [];
}
console.log(this.goodsForm.operAuthPre);
console.log(this.goodsForm.operAuthPre.join(','));
// this.btnLoading = true;
this.$emit('updateLoading');
let params = {
......@@ -1246,7 +1248,7 @@ export default {
giftSpecInfo: JSON.stringify(this.goodsStandardInfo),
skuList: skuList,
operAuthType: this.goodsForm.operAuthType, // 操作人权限
operAuth: this.goodsForm.operAuthPre.join(''), // 操作人权限
operAuth: this.goodsForm.operAuthPre.join(','), // 操作人权限
deliveryType: this.goodsForm.deliveryType, // 兑换方式
source: 1, // 新建方式 默认手动发布1
shopSelectType: this.diliveryData.shopSelectType, // 门店选择类型
......@@ -1255,6 +1257,7 @@ export default {
stockUseType: this.goodsForm.stockUseType, // 库存使用类型
};
this.btnLoading = true;
console.log(params);
if (this.isEdit) {
// params.giftId = this.giftId;
giftUpdate(params).then(res =>{
......
src/views/gift-manage/stock-record.vue
......@@ -13,18 +13,33 @@
</div>
<div class="table-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%">
<el-table-column label="上传时间" prop="createTime" width="300px"></el-table-column>
<el-table-column label="上传时间" prop="createTime" width="300px">
<template slot-scope="scope">
<div v-html="listTime(scope.row.createTime)"></div>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="操作人" min-width="150px"></el-table-column>
<el-table-column prop="fileName" label="文件名称" min-width="150px"></el-table-column>
<el-table-column prop="giftName" label="福利名称" min-width="120px"></el-table-column>
<el-table-column label="上传结果" min-width="150px">
<template slot-scope="scope">
<div v-if="scope.row.statusFlag === 0">
<span v-if="scope.row.progress === 0">上传中</span>
<span v-else>上传失败</span>
</div>
<div v-else>
成功<span class="blue">{{ scope.row.successNum }}</span>条，失败<span class="danger-color">{{ scope.row.errorNum }}</span>条，<el-button type="text" @click="checkDetail">查看详情</el-button>
</div>
</template>
</el-table-column>
<!-- <el-table-column label="操作" min-width="150px">
<template slot-scope="scope">
<div v-if="scope.row.statusFlag === 0">处理中</div>
<div v-else>
成功<span class="blue">{{ scope.row.success }}</span>条，失败<span class="danger-color">{{ scope.row.fail }}</span>条，<el-button type="text" @click="checkDetail">查看详情</el-button>
</div>
</template>
</el-table-column>
</el-table-column> -->
</el-table>
<div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
<div class="pagination">
......@@ -43,7 +58,7 @@
</template>
<script>
import { page, formate } from '@/mixins/table.js';
import { formatDateTimeByType } from '@/utils/index.js';
import { formatDateTimeByType, listTime } from '@/utils/index.js';
import api from '@/api/gift.js';
const { virtualUploadLog } = api;
export default {
......@@ -61,6 +76,7 @@ export default {
}
],
formatDateTimeByType,
listTime,
// activeName: '0',
mixins: [ page, formate ],
proType: '',
......@@ -69,39 +85,7 @@ export default {
total: 0,
sortOrder: '',
sortColumn: '',
// tableData: [],
tableData: [
{
createTime: '1610693597000',
statusFlag: 0,
creatorName: '超级管理员',
fileName: '我是文件啦啦啦',
giftName: '年终福利',
success: '2',
fail: '1',
uploadLogId: '111111'
},
{
createTime: '1610693597000',
statusFlag: 1,
creatorName: '小熊饼干',
fileName: '我是文件小魔仙',
giftName: '过年啦',
success: '2',
fail: '1',
uploadLogId: '111111'
},
{
createTime: '1610693597000',
statusFlag: 2,
creatorName: '纯甄牛奶',
fileName: '我是文件小哪吒',
giftName: '放鞭炮',
success: '2',
fail: '1',
uploadLogId: '111111'
}
],
tableData: [],
loading: false,
// 搜索条件
search: '',
......@@ -124,6 +108,7 @@ export default {
this.$emit('updateBread', this.bread);
this.$emit('showAside', true);
this.init();
console.log(new Date().getHours());
},
methods: {
init() {
......@@ -173,7 +158,7 @@ export default {
};
virtualUploadLog(params).then(res =>{
console.log(res);
this.tableData = res.result;
this.tableData = res.result.result;
console.log(this.tableData);
});
},
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -147,7 +147,14 @@ import { request } from '../../utils/request';
// import { deepClone } from '../../utils/index';
import api from '@/api/gift.js';
import uploadUrl from '@/api/common.js';
const { giftGet, giftUpdate, giftSave, virtualGiftUpload, getGiftId, giftTemplateDownload, getOperatorList } = api;
const {
giftGet,
giftUpdate,
giftSave,
virtualGiftUpload,
getGiftId,
// getOperatorList,
giftTemplateDownload } = api;
import checkUploadDetail from './module/check-upload-detail';
export default {
components: {
......@@ -394,20 +401,20 @@ export default {
});
},
// 操作人权限数据回显
getOperatorList(){
let params = {
typeEnum: 'WELFARE',
relationId: this.giftId
};
getOperatorList(params).then(res =>{
if(res.code === '0000'){
console.log(res.result);
this.goodsForm.operAuthPre = res.result;
}else{
this.$message.error(res.message);
}
});
},
// getOperatorList(){
// let params = {
// typeEnum: 'WELFARE',
// relationId: this.giftId
// };
// getOperatorList(params).then(res =>{
// if(res.code === '0000'){
// console.log(res.result);
// this.goodsForm.operAuthPre = res.result;
// }else{
// this.$message.error(res.message);
// }
// });
// },
getMess() {
let params = {
id: this.giftId
......@@ -427,7 +434,8 @@ export default {
// this.goodsForm.tableData[0].stock = resResult.stock;
// this.goodsForm.tableData[0].giftBarNo = resResult.giftBarNo;
this.goodsForm.marketPrice = resResult.marketPrice; // 市场价
this.goodsForm.operatorAuth = resResult.operatorAuth; // 操作人权限
this.goodsForm.operAuthType = resResult.operAuthType; // 操作人权限
this.goodsForm.operAuthPre = resResult.operAuth.split(',');
// this.goodsForm.shopCodeList = resResult.shopId; // 操作人权限code
this.goodsForm.template = resResult.template; // 虚拟礼品模板
this.goodsForm.checkList = resResult.stockUseType == 2 ? [ 1, 2 ] : (resResult.stockUseType == 1 ? [ 1 ] : [ 0 ]); // 库存消耗方式
......@@ -524,7 +532,7 @@ export default {
giftSpecInfo: JSON.stringify(this.goodsStandardInfo),
skuList: [],
operAuthType: this.goodsForm.operAuthType, // 操作人权限
operAuth: this.goodsForm.operAuthPre.join(''), // 操作人权限
operAuth: this.goodsForm.operAuthPre.join(','), // 操作人权限
deliveryType: '3', // 兑换方式
source: 1, // 新建方式 默认手动发布1
shopSelectType: '', // 门店选择类型
......
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