Skip to content

O
office-web
Commit 9464a087 by zhu_yu_dan
Options

bug:搜索后选择人点击取消后跳转,行政架构成员状态展示,门店筛选问题

parent 07786d71
Showing with 32 additions and 16 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.5d527e58acf77e8ca4e4a8c19577dcab.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=https://cdn.ravenjs.com/3.26.2/vue/raven.min.js crossorigin=anonymous></script><script>Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.b0a478f486841529660b.js></script><script type=text/javascript src=./static/js/vendor.8d54360f860a96e84004.js></script><script type=text/javascript src=./static/js/app.0f91f4dec7dec67c5d69.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.5d527e58acf77e8ca4e4a8c19577dcab.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=https://cdn.ravenjs.com/3.26.2/vue/raven.min.js crossorigin=anonymous></script><script>Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.056c161bd46dc9eb84ca.js></script><script type=text/javascript src=./static/js/vendor.8d54360f860a96e84004.js></script><script type=text/javascript src=./static/js/app.0f91f4dec7dec67c5d69.js></script></body></html>
\ No newline at end of file \ No newline at end of file
dist/static/js/18.32dae5f5c67e5fbcd4da.js deleted 100644 → 0
webpackJsonp([18],{"27o1":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r("3Xzz"),o={name:"add-clerk-page",components:{clerkInfo:r("oncj").a,navCrumb:n.a},data:function(){return{navpath:[{name:"首页",path:"/index"},{name:"企业通讯录",path:"/administrativeFrame"},{name:"门店架构",path:"/storeFrame"},{name:"新增店员",path:""}],isAddnew:!1}},beforeMount:function(){this.$route.query.clerkId?this.isAddnew=!1:this.isAddnew=!0}},a={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"common-set-wrap add-clerk-wrap"},[t("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),t("div",{staticClass:"right-content"},[t("div",{staticClass:"right-box"},[t("div",{staticClass:"add-clerk-page"},[t("clerk-info",{attrs:{isAddnew:this.isAddnew}})],1)])]),this._v(" "),t("vue-gic-footer")],1)},staticRenderFns:[]};var s=r("VU/8")(o,a,!1,function(e){r("GrJx")},null,null);t.default=s.exports},GrJx:function(e,t){},"iL/9":function(e,t){},oncj:function(e,t,r){"use strict";var n=r("Ie7z"),o=r("P9l9"),a=r("PI0u"),s={name:"clerk-info-form",props:{isAddnew:{type:Boolean,default:!1},perId:{type:[String,Number],default:""}},components:{vueSelectStore:n.a},data:function(){return{rules:{name:[{required:!0,message:"请输入店员姓名",trigger:"blur"},{min:2,max:10,message:"长度在 2 到 10 个字符",trigger:"blur"}],phoneNumber:[{required:!0,validator:function(e,t,r){if(t)return/^1[34578]\d{9}$/.test(t)?r():r(new Error("手机号格式不正确"));return r(new Error("请输入手机号"))},trigger:"blur"}],storeName:[{required:!0,message:"请选择门店",trigger:"change"}],code:[{required:!0,message:"请输入code",trigger:"blur"},{min:2,max:20,message:"长度在 2 到 20 个字符",trigger:"blur"}],positionName:[{required:!0,message:"请输入店员职位",trigger:"blur"}]},clerkInfo:{storeName:"",storeId:"",managerMode:!1},treeSet:{isSelectPerson:!1,dialogVisible:!1,isSingle:!0}}},methods:{toInput:Object(a.a)(function(e){var t=e.target.value.match(/[A-Za-z0-9]/g);t?(t=t.join(""),this.clerkInfo.code=t):this.clerkInfo.code=""},500),saveFn:function(e){var t=!0;this.$refs.clerk_info.validate(function(e){e||(t=!1)}),t&&this.addEmployee(this.clerkInfo,e)},callSelector:function(){this.treeSet.dialogVisible=!0},handleSelectedList:function(e){this.clerkInfo.storeName=e&&e.length?e[0].label:"",this.clerkInfo.storeId=e&&e.length?e[0].id:""},addEmployee:function(e,t){var r=this,n={name:e.name,isClerk:1,phoneNumber:e.phoneNumber,positionName:e.positionName,storeId:e.storeId,managerMode:1*e.managerMode,code:e.code,employeeClerkId:e.employeeClerkId||""},a=r.isAddnew?"/haoban-manage-web/emp/add":"/haoban-manage-web/emp/update";Object(o.a)(a,n).then(function(e){1==e.data.errorCode?(r.$message.success({message:"操作成功"}),1==t?r.clerkInfo={name:"",isClerk:1,phoneNumber:"",positionName:"",storeId:"",managerMode:!1,code:""}:r.$router.push("/storeFrame")):r.$message.error({message:e.data.message})}).catch(function(e){r.$message.error({message:e.message})})},cancel:function(){this.$confirm(" 是否确认取消，取消后当前页面信息将丢失 ？","提示",{type:"warning"}).then(function(){window.history.go(-1)}).catch(function(e){})},getClerkInfo:function(){var e=this,t={id:e.$route.query.clerkId?e.$route.query.clerkId:e.perId};Object(o.a)("/haoban-manage-web/emp/findOne",t).then(function(t){1==t.data.errorCode?e.clerkInfo=t.data.result:e.$message.error({message:t.data.message})}).catch(function(t){e.$message.error({message:t})})}},beforeMount:function(){this.isAddnew||this.getClerkInfo()},watch:{perId:function(e,t){this.getClerkInfo(e)}}},i={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"form-container bdr-box"},[r("el-form",{ref:"clerk_info",staticClass:"add-clerk-form",attrs:{model:e.clerkInfo,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"姓名",prop:"name"}},[r("el-input",{model:{value:e.clerkInfo.name,callback:function(t){e.$set(e.clerkInfo,"name",t)},expression:"clerkInfo.name"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"手机号",prop:"phoneNumber"}},[r("el-input",{attrs:{disabled:!e.isAddnew},model:{value:e.clerkInfo.phoneNumber,callback:function(t){e.$set(e.clerkInfo,"phoneNumber",t)},expression:"clerkInfo.phoneNumber"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"门店",prop:"storeName"}},[r("el-input",{on:{focus:e.callSelector},model:{value:e.clerkInfo.storeName,callback:function(t){e.$set(e.clerkInfo,"storeName",t)},expression:"clerkInfo.storeName"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"code",prop:"code"}},[r("el-input",{nativeOn:{keyup:function(t){return r=t,e.toInput(r);var r}},model:{value:e.clerkInfo.code,callback:function(t){e.$set(e.clerkInfo,"code",t)},expression:"clerkInfo.code"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"职位",prop:"positionName"}},[r("el-input",{model:{value:e.clerkInfo.positionName,callback:function(t){e.$set(e.clerkInfo,"positionName",t)},expression:"clerkInfo.positionName"}})],1)],1),e._v(" "),r("div",{staticClass:"btn-box"},[r("el-button",{attrs:{type:"primary"},on:{click:e.saveFn}},[e._v("保 存")]),e._v(" "),e.isAddnew?r("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveFn(1)}}},[e._v("保存并继续添加")]):e._e(),e._v(" "),r("el-button",{on:{click:e.cancel}},[e._v("取 消")])],1),e._v(" "),r("vue-select-store",{ref:"storeSelector",attrs:{treeSet:e.treeSet,selectType:"store"},on:{handleSelectedList:e.handleSelectedList}})],1)},staticRenderFns:[]};var l=r("VU/8")(s,i,!1,function(e){r("iL/9")},null,null);t.a=l.exports}});
\ No newline at end of file
dist/static/js/18.495c6d42864feed02ba1.js 0 → 100644
webpackJsonp([18],{"27o1":function(e,t,r){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=r("3Xzz"),a={name:"add-clerk-page",components:{clerkInfo:r("oncj").a,navCrumb:n.a},data:function(){return{navpath:[{name:"首页",path:"/index"},{name:"企业通讯录",path:"/administrativeFrame"},{name:"门店架构",path:"/storeFrame"},{name:"新增店员",path:""}],isAddnew:!1}},beforeMount:function(){this.$route.query.clerkId?this.isAddnew=!1:this.isAddnew=!0}},o={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{staticClass:"common-set-wrap add-clerk-wrap"},[t("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),t("div",{staticClass:"right-content"},[t("div",{staticClass:"right-box"},[t("div",{staticClass:"add-clerk-page"},[t("clerk-info",{attrs:{isAddnew:this.isAddnew}})],1)])]),this._v(" "),t("vue-gic-footer")],1)},staticRenderFns:[]};var s=r("VU/8")(a,o,!1,function(e){r("GrJx")},null,null);t.default=s.exports},GrJx:function(e,t){},irXm:function(e,t){},oncj:function(e,t,r){"use strict";var n=r("Ie7z"),a=r("P9l9"),o=r("PI0u"),s={name:"clerk-info-form",props:{isAddnew:{type:Boolean,default:!1},perId:{type:[String,Number],default:""}},components:{vueSelectStore:n.a},data:function(){return{rules:{name:[{required:!0,message:"请输入店员姓名",trigger:"blur"},{min:2,max:10,message:"长度在 2 到 10 个字符",trigger:"blur"}],phoneNumber:[{required:!0,validator:function(e,t,r){if(t)return/^1[34578]\d{9}$/.test(t)?r():r(new Error("手机号格式不正确"));return r(new Error("请输入手机号"))},trigger:"blur"}],storeName:[{required:!0,message:"请选择门店",trigger:"change"}],code:[{required:!0,message:"请输入code",trigger:"blur"},{min:2,max:20,message:"长度在 2 到 20 个字符",trigger:"blur"}],positionName:[{required:!0,message:"请输入店员职位",trigger:"blur"}]},clerkInfo:{storeName:"",storeId:"",managerMode:!1},treeSet:{isSelectPerson:!1,dialogVisible:!1,isSingle:!0}}},methods:{toInput:Object(o.a)(function(e){var t=e.target.value.match(/[A-Za-z0-9]/g);t?(t=t.join(""),this.clerkInfo.code=t):this.clerkInfo.code=""},500),saveFn:function(e){var t=!0;this.$refs.clerk_info.validate(function(e){e||(t=!1)}),t&&this.addEmployee(this.clerkInfo,e)},callSelector:function(){this.treeSet.dialogVisible=!0},handleSelectedList:function(e){this.clerkInfo.storeName=e&&e.length?e[0].label:"",this.clerkInfo.storeId=e&&e.length?e[0].id:""},addEmployee:function(e,t){var r=this,n={name:e.name,isClerk:1,phoneNumber:e.phoneNumber,positionName:e.positionName,storeId:e.storeId,managerMode:1*e.managerMode,code:e.code,employeeClerkId:e.employeeClerkId||""},o=r.isAddnew?"/haoban-manage-web/emp/add":"/haoban-manage-web/emp/update";Object(a.a)(o,n).then(function(e){1==e.data.errorCode?(r.$message.success({message:"操作成功"}),1==t?r.clerkInfo={name:"",isClerk:1,phoneNumber:"",positionName:"",storeId:"",managerMode:!1,code:""}:r.$router.push("/storeFrame")):r.$message.error({message:e.data.message})}).catch(function(e){r.$message.error({message:e.message})})},cancel:function(){var e=this;this.$confirm(" 是否确认取消，取消后当前页面信息将丢失 ？","提示",{type:"warning"}).then(function(){e.$emit("cancelClerkInfo",!0)}).catch(function(e){})},getClerkInfo:function(){var e=this,t={id:e.$route.query.clerkId?e.$route.query.clerkId:e.perId};Object(a.a)("/haoban-manage-web/emp/findOne",t).then(function(t){1==t.data.errorCode?e.clerkInfo=t.data.result:e.$message.error({message:t.data.message})}).catch(function(t){e.$message.error({message:t})})}},beforeMount:function(){this.isAddnew||this.getClerkInfo()},watch:{perId:function(e,t){this.getClerkInfo(e)}}},i={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"form-container bdr-box"},[r("el-form",{ref:"clerk_info",staticClass:"add-clerk-form",attrs:{model:e.clerkInfo,rules:e.rules,"label-width":"80px"}},[r("el-form-item",{attrs:{label:"姓名",prop:"name"}},[r("el-input",{model:{value:e.clerkInfo.name,callback:function(t){e.$set(e.clerkInfo,"name",t)},expression:"clerkInfo.name"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"手机号",prop:"phoneNumber"}},[r("el-input",{attrs:{disabled:!e.isAddnew},model:{value:e.clerkInfo.phoneNumber,callback:function(t){e.$set(e.clerkInfo,"phoneNumber",t)},expression:"clerkInfo.phoneNumber"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"门店",prop:"storeName"}},[r("el-input",{on:{focus:e.callSelector},model:{value:e.clerkInfo.storeName,callback:function(t){e.$set(e.clerkInfo,"storeName",t)},expression:"clerkInfo.storeName"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"code",prop:"code"}},[r("el-input",{nativeOn:{keyup:function(t){return r=t,e.toInput(r);var r}},model:{value:e.clerkInfo.code,callback:function(t){e.$set(e.clerkInfo,"code",t)},expression:"clerkInfo.code"}})],1),e._v(" "),r("el-form-item",{attrs:{label:"职位",prop:"positionName"}},[r("el-input",{model:{value:e.clerkInfo.positionName,callback:function(t){e.$set(e.clerkInfo,"positionName",t)},expression:"clerkInfo.positionName"}})],1)],1),e._v(" "),r("div",{staticClass:"btn-box"},[r("el-button",{attrs:{type:"primary"},on:{click:e.saveFn}},[e._v("保 存")]),e._v(" "),e.isAddnew?r("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.saveFn(1)}}},[e._v("保存并继续添加")]):e._e(),e._v(" "),r("el-button",{on:{click:e.cancel}},[e._v("取 消")])],1),e._v(" "),r("vue-select-store",{ref:"storeSelector",attrs:{treeSet:e.treeSet,selectType:"store"},on:{handleSelectedList:e.handleSelectedList}})],1)},staticRenderFns:[]};var l=r("VU/8")(s,i,!1,function(e){r("irXm")},null,null);t.a=l.exports}});
\ No newline at end of file
dist/static/js/manifest.b0a478f486841529660b.js → dist/static/js/manifest.056c161bd46dc9eb84ca.js
!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,d,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(f,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=b(b.s=n[i]);return o};var f={},c={72:0};function b(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,b),c.l=!0,c.exports}b.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,b){a=c[e]=[f,b]});a[2]=f;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,b.nc&&n.setAttribute("nonce",b.nc),n.src=b.p+"static/js/"+e+"."+{0:"f7af9590fc7d0e522898",1:"0ebe3ead93207dc78a78",2:"246f54f98ebd0f18e3c2",3:"b77f7b117eba0efcd002",4:"20af2d42af746f1c5642",5:"0a441cb5a76687f6aebb",6:"87e91c93edff79bf2848",7:"29467a72cfdc2dfba901",8:"834bf1ab16bf28a5d71f",9:"7a62f51b7c112ab1f4b6",10:"9fa83af5fa02d3fb8384",11:"cefe5cb2649342b46abc",12:"291aefb99fbe47418137",13:"76bed97bf902bd5e9663",14:"6b356a1dc19916403937",15:"5d5fbdd500ad707efe36",16:"f98864723609ffd69dec",17:"90569fafeeb0560983cb",18:"32dae5f5c67e5fbcd4da",19:"6b676a2bc781b744d643",20:"984e3f8a01194c387a0e",21:"95b9e75e267a37620b22",22:"2e13bc47faa71485d785",23:"d35b207fb2e00e9743a3",24:"324b388a5029325ec860",25:"4f9db49437ea94436d03",26:"86316b0d7ab60ac4bcbe",27:"44c464bb4d4d251d101e",28:"3fdd0d66a13f6014559b",29:"c40fe741197d553f3247",30:"e16084cc0e35a7c402f8",31:"aa5e346cb6bce343e4d3",32:"577c38116657d4ec907d",33:"998efd2498a66fbc7d59",34:"d73966a9ca7d8fd92e6a",35:"e73ac02923086619aaaf",36:"6b7ba3c82f569f7a47e0",37:"f8bf84592943c5dfbf8a",38:"db0ccdb9d831a1fee238",39:"8861e4489f26fe322990",40:"c6cf553f8eb155ae6f1a",41:"119ab10f2d353ddcdbc8",42:"531aa219ae17b75cbba0",43:"12da44fb0a9bace6abfa",44:"c2920a3e2a76bdf7916f",45:"c50573da6f7f6510e8bb",46:"6b9089dbfdc51cf214aa",47:"2dab44b216bdf0b2aa0d",48:"6420334f070d0e2c2698",49:"0993eb5909e11a29796e",50:"83766d9322982df0ba7c",51:"52175c8deed6c318442f",52:"bffa8eb85dc92c8223c2",53:"84eaec4c0f59c1c56bc0",54:"b81dae7a0972e539186e",55:"407ba1031c842531a35d",56:"176e6633c1ad78f38876",57:"110e66042ef93c6e1baa",58:"29bf2c34b494dcd2c36a",59:"b87c9da279978fab1ab0",60:"d65ff9eab5d4620bad91",61:"2ec808603001095fcf7e",62:"5e5c3f7ea5d9eb5be654",63:"ef0894a527ba021ba0a5",64:"25749490fd7938fce09a",65:"18c11765ac0cd3eddb3e",66:"9f1afb5a13b54ea92a02",67:"d674abd10a01e3c004c8",68:"76dd85fe130f3711e79e",71:"391d038af9b6f69e350f"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),f},b.m=e,b.c=f,b.d=function(e,a,f){b.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},b.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(a,"a",a),a},b.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]); !function(e){var a=window.webpackJsonp;window.webpackJsonp=function(f,b,n){for(var r,t,o,i=0,u=[];i<f.length;i++)t=f[i],c[t]&&u.push(c[t][0]),c[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(a&&a(f,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var f={},c={72:0};function d(a){if(f[a])return f[a].exports;var c=f[a]={i:a,l:!1,exports:{}};return e[a].call(c.exports,c,c.exports,d),c.l=!0,c.exports}d.e=function(e){var a=c[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var f=new Promise(function(f,d){a=c[e]=[f,d]});a[2]=f;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"f7af9590fc7d0e522898",1:"0ebe3ead93207dc78a78",2:"246f54f98ebd0f18e3c2",3:"d6e9ddb55782dc8b8c96",4:"20af2d42af746f1c5642",5:"7d1dd1b792dd8fb7ad4e",6:"87e91c93edff79bf2848",7:"29467a72cfdc2dfba901",8:"834bf1ab16bf28a5d71f",9:"7a62f51b7c112ab1f4b6",10:"9fa83af5fa02d3fb8384",11:"cefe5cb2649342b46abc",12:"291aefb99fbe47418137",13:"76bed97bf902bd5e9663",14:"6b356a1dc19916403937",15:"5d5fbdd500ad707efe36",16:"f98864723609ffd69dec",17:"90569fafeeb0560983cb",18:"495c6d42864feed02ba1",19:"6b676a2bc781b744d643",20:"984e3f8a01194c387a0e",21:"95b9e75e267a37620b22",22:"2e13bc47faa71485d785",23:"d35b207fb2e00e9743a3",24:"324b388a5029325ec860",25:"4f9db49437ea94436d03",26:"86316b0d7ab60ac4bcbe",27:"44c464bb4d4d251d101e",28:"3fdd0d66a13f6014559b",29:"c40fe741197d553f3247",30:"e16084cc0e35a7c402f8",31:"aa5e346cb6bce343e4d3",32:"577c38116657d4ec907d",33:"998efd2498a66fbc7d59",34:"d73966a9ca7d8fd92e6a",35:"e73ac02923086619aaaf",36:"6b7ba3c82f569f7a47e0",37:"f8bf84592943c5dfbf8a",38:"db0ccdb9d831a1fee238",39:"8861e4489f26fe322990",40:"c6cf553f8eb155ae6f1a",41:"119ab10f2d353ddcdbc8",42:"531aa219ae17b75cbba0",43:"12da44fb0a9bace6abfa",44:"c2920a3e2a76bdf7916f",45:"c50573da6f7f6510e8bb",46:"6b9089dbfdc51cf214aa",47:"2dab44b216bdf0b2aa0d",48:"6420334f070d0e2c2698",49:"0993eb5909e11a29796e",50:"83766d9322982df0ba7c",51:"52175c8deed6c318442f",52:"bffa8eb85dc92c8223c2",53:"84eaec4c0f59c1c56bc0",54:"b81dae7a0972e539186e",55:"407ba1031c842531a35d",56:"176e6633c1ad78f38876",57:"110e66042ef93c6e1baa",58:"29bf2c34b494dcd2c36a",59:"b87c9da279978fab1ab0",60:"d65ff9eab5d4620bad91",61:"2ec808603001095fcf7e",62:"5e5c3f7ea5d9eb5be654",63:"ef0894a527ba021ba0a5",64:"25749490fd7938fce09a",65:"18c11765ac0cd3eddb3e",66:"9f1afb5a13b54ea92a02",67:"d674abd10a01e3c004c8",68:"76dd85fe130f3711e79e",71:"391d038af9b6f69e350f"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=c[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),f},d.m=e,d.c=f,d.d=function(e,a,f){d.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:f})},d.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(a,"a",a),a},d.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file \ No newline at end of file
src/components/contacts/employeeList.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<el-table-column :key="prop" v-if="prop == 'activationStatus'" label="状态"> <el-table-column :key="prop" v-if="prop == 'activationStatus'" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="status-icon" :class="scope.row.activationStatus == 1 ? 'is-active' : ''"> <div class="status-icon" :class="scope.row.activationStatus == 1 ? 'is-active' : ''">
<i class="iconfont icon-shouji" style="color: #409eff;"></i> <i class="iconfont icon-shouji"></i>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
......
src/components/contacts/storeFrame/clerkInfo.vue
...@@ -165,7 +165,8 @@ export default { ...@@ -165,7 +165,8 @@ export default {
type: 'warning' type: 'warning'
}) })
.then(() => { .then(() => {
window.history.go(-1); // window.history.go(-1);
this.$emit('cancelClerkInfo', true);
}) })
/* eslint-disable */ /* eslint-disable */
.catch(e => { .catch(e => {
......
src/views/contacts/administrativeFrame.vue
...@@ -397,7 +397,6 @@ export default { ...@@ -397,7 +397,6 @@ export default {
background: #ecf5ff; background: #ecf5ff;
border: 1px solid #d9ecff; border: 1px solid #d9ecff;
border-radius: 4px; border-radius: 4px;
&.is-active { &.is-active {
.iconfont { .iconfont {
color: #409eff; color: #409eff;
......
src/views/contacts/storeFrame.vue
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</div> </div>
</template> </template>
</search-menu> </search-menu>
<clerk-info v-if="showEmployee == 'employee'" :perId="perId"> </clerk-info> <clerk-info v-if="showEmployee == 'employee'" :perId="perId" @cancelClerkInfo="cancelClerkInfo"> </clerk-info>
<store-info ref="store_info" v-else-if="showEmployee == 'store'" :storeInfo="storeInfo"> </store-info> <store-info ref="store_info" v-else-if="showEmployee == 'store'" :storeInfo="storeInfo"> </store-info>
<div class="sf-right-container common-right-container" v-else v-loading="loading"> <div class="sf-right-container common-right-container" v-else v-loading="loading">
<div class="sf-right-header common-right-header"> <div class="sf-right-header common-right-header">
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
<el-radio-button :label="1">门店视图</el-radio-button> <el-radio-button :label="1">门店视图</el-radio-button>
<el-radio-button :label="2">店员视图</el-radio-button> <el-radio-button :label="2">店员视图</el-radio-button>
</el-radio-group> </el-radio-group>
<!-- <el-button @click="recycleListBtn" class="a-href fr" type="primary" icon="el-icon-delete">回收站（{{ recycleList.length }}）</el-button> -->
<a :href="'#/recycle?dept=' + groupInfo.departmentId + '&showChild=' + showChildMember * 1 + '&type=' + storeType" class="a-href fr"> <a :href="'#/recycle?dept=' + groupInfo.departmentId + '&showChild=' + showChildMember * 1 + '&type=' + storeType" class="a-href fr">
<el-button type="primary" icon="el-icon-delete">回收站（{{ recycleList.length }}）</el-button> <el-button type="primary" icon="el-icon-delete">回收站（{{ recycleList.length }}）</el-button>
</a> </a>
...@@ -115,7 +116,8 @@ export default { ...@@ -115,7 +116,8 @@ export default {
disableBtn: true, disableBtn: true,
storeStatus: '', storeStatus: '',
storeType: '', storeType: '',
recycleList: [] recycleList: [],
recycleBool: false
}; };
}, },
...@@ -252,23 +254,24 @@ export default { ...@@ -252,23 +254,24 @@ export default {
getStoreList() { getStoreList() {
let that = this; let that = this;
that.loading = true; that.loading = true;
let params = { let params = {
storeGroupId: that.groupInfo.departmentId, storeGroupId: that.groupInfo.departmentId,
showChild: that.showChildMember * 1, showChild: that.showChildMember * 1,
showType: that.tableView, showType: that.tableView,
pageSize: that.pageSize, pageSize: that.pageSize,
pageNum: that.pageNumber, pageNum: that.pageNumber,
status: that.storeStatus, status: that.recycleBool ? 4 : that.storeStatus,
storeType: that.storeType storeType: that.storeType
}; };
getRequest('/haoban-manage-web/store/findSimplePage', params) getRequest('/haoban-manage-web/store/findSimplePage', params)
.then(res => { .then(res => {
if (res.data.errorCode == 1) { if (res.data.errorCode == 1) {
that.loading = false;
if (params.status == 4) { if (params.status == 4) {
// 获取回收站列表数据 // 获取回收站列表数据
that.recycleList = res.data.result.list || []; that.recycleList = res.data.result.list || [];
that.storeStatus = ''; that.recycleBool = false;
that.loading = false;
} else { } else {
that.total = res.data.result.total; that.total = res.data.result.total;
// 增加删除 popover 参数 // 增加删除 popover 参数
...@@ -283,8 +286,7 @@ export default { ...@@ -283,8 +286,7 @@ export default {
}); });
} }
that.storeList = res.data.result.list || []; that.storeList = res.data.result.list || [];
that.loading = false; that.recycleBool = true; // 为了获取门店回收站数量
that.storeStatus = 4;
that.getStoreList(); that.getStoreList();
} }
} else { } else {
...@@ -314,7 +316,9 @@ export default { ...@@ -314,7 +316,9 @@ export default {
this.showEmployee = showEmployee; this.showEmployee = showEmployee;
this.groupInfo.hasPression = obj.hasPression; this.groupInfo.hasPression = obj.hasPression;
this.groupInfo.level = obj.level; this.groupInfo.level = obj.level;
this.storeStatus = '';
this.getStoreList(); this.getStoreList();
this.recycleListBtn();
}, },
/** /**
* 店员视图根据店铺状态筛选店铺 * 店员视图根据店铺状态筛选店铺
...@@ -329,10 +333,22 @@ export default { ...@@ -329,10 +333,22 @@ export default {
selectByType(type) { selectByType(type) {
this.storeType = type; this.storeType = type;
this.getStoreList(); this.getStoreList();
},
// 取消保存人员信息
cancelClerkInfo(val) {
if (val) {
this.showEmployee = '';
}
},
// 回收站
recycleListBtn() {
this.storeStatus = 4;
this.getStoreList();
} }
}, },
beforeMount() { beforeMount() {
this.getGroupData(); this.getGroupData();
// this.recycleListBtn(); // 获取回收站数量
}, },
mounted() { mounted() {
this.disableBtn = false; this.disableBtn = false;
......
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