fix: 修改门店架构

e037fc49 · 无尘 · c10495d0 · e037fc49 · e037fc49 · c10495d0
Commit e037fc49 authored Mar 28, 2019 by 无尘
5 changed files
--- a/dist/index.html
+++ b/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.9ffd80a362beb879ba75d6d8dee5c99d.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.137092945810187b05be.js></script><script type=text/javascript src=./static/js/vendor.2a06374a31d674ca49d2.js></script><script type=text/javascript src=./static/js/app.2a1ad6040a1ec278014d.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.9ffd80a362beb879ba75d6d8dee5c99d.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.b45927f65264bdab23de.js></script><script type=text/javascript src=./static/js/vendor.2a06374a31d674ca49d2.js></script><script type=text/javascript src=./static/js/app.2a1ad6040a1ec278014d.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/5.40821382b68441cb50f0.js
+++ b/dist/static/js/5.40821382b68441cb50f0.js
--- a/dist/static/js/5.b2540360eda0ee16006c.js
+++ b/dist/static/js/5.b2540360eda0ee16006c.js
--- a/dist/static/js/manifest.137092945810187b05be.js
+++ b/dist/static/js/manifest.137092945810187b05be.js
-!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],b[t]&&u.push(b[t][0]),b[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},b={73:0};function f(a){if(c[a])return c[a].exports;var b=c[a]={i:a,l:!1,exports:{}};return e[a].call(b.exports,b,b.exports,f),b.l=!0,b.exports}f.e=function(e){var a=b[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=b[e]=[c,f]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"a445e74b3900f3876c72",1:"0ebe3ead93207dc78a78",2:"c8863e7a9d4b284238db",3:"c3b5d44657dc5ac68265",4:"59afc6b09559f1ebc067",5:"b2540360eda0ee16006c",6:"00b931389a74250125a3",7:"2d8d6e52a6ac43313122",8:"ccfd1bb81626da46f432",9:"b916c8d12141617e4db2",10:"84a1849b0202f4273f23",11:"48cce40bd1119cfef79d",12:"8a1633b353b37d5bfcd2",13:"462b158420af9109c2c4",14:"94920536d81601122060",15:"35d29be8ae21328d7a1a",16:"7016f834cadae9b57028",17:"2c76434ec01b2b5ee02f",18:"d07d6af2aa0d5ee86261",19:"7ed28ae00b8809d6d671",20:"8f48037229efe39f46f1",21:"2103d8428d4f707fa369",22:"dec9447a8c45f2a2c7bb",23:"bd9202e3991ee39668e6",24:"54f2906c51709913d672",25:"4f9db49437ea94436d03",26:"1649432938888d71b3c9",27:"67137144c98b28cc5a30",28:"140ad99228544036c969",29:"30037b5674e7675b1da7",30:"fa0e0e20a9883b94be73",31:"a8e20732b0b0f62f5c5a",32:"509f0e1d73c3190be53a",33:"d649a5e4d061985d1c3a",34:"4977e6b9167f796404b9",35:"718d90637b7e54754f31",36:"6b7ba3c82f569f7a47e0",37:"f8bf84592943c5dfbf8a",38:"db0ccdb9d831a1fee238",39:"8861e4489f26fe322990",40:"c6cf553f8eb155ae6f1a",41:"119ab10f2d353ddcdbc8",42:"3cda7effdd6238c3e2d9",43:"afd187ba0590923ba9e5",44:"77199a317327d7ebcf4b",45:"5b64fee2aa3e6c3e3fc9",46:"588053d1bdb79f78028d",47:"e53a7b3b284d29858fae",48:"75da586a106599c730c1",49:"028b1255269b880f351b",50:"4289d8f282974207066c",51:"98c3602fc3a9ab54693a",52:"5ea13e39ab6e51a9054f",53:"5232792298264e487629",54:"4749eb7f37153ac94005",55:"bea6622b77dd0e24b535",56:"a2faa30e5f1c6aeb57be",57:"9064c84ce91fad83fe44",58:"04dbe15e8a9576b15187",59:"b62232922e7ccdd7242e",60:"956a6a3b0b11e618bd1b",61:"c220c6bad221831a72f6",62:"f797b18bb14b4d79151b",63:"b05b4ec28d2829c54f65",64:"0be98c69b2be684d451f",65:"e069a6e1df52acf3f14f",66:"9f1afb5a13b54ea92a02",67:"d674abd10a01e3c004c8",68:"2189902bf2848c91608c",69:"4087b90ee08d0100519f",72:"e19aae5a21dcfad3391e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=b[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var a=window.webpackJsonp;window.webpackJsonp=function(c,d,n){for(var r,t,o,i=0,u=[];i<c.length;i++)t=c[i],b[t]&&u.push(b[t][0]),b[t]=0;for(r in d)Object.prototype.hasOwnProperty.call(d,r)&&(e[r]=d[r]);for(a&&a(c,d,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var c={},b={73:0};function f(a){if(c[a])return c[a].exports;var b=c[a]={i:a,l:!1,exports:{}};return e[a].call(b.exports,b,b.exports,f),b.l=!0,b.exports}f.e=function(e){var a=b[e];if(0===a)return new Promise(function(e){e()});if(a)return a[2];var c=new Promise(function(c,f){a=b[e]=[c,f]});a[2]=c;var d=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"a445e74b3900f3876c72",1:"0ebe3ead93207dc78a78",2:"c8863e7a9d4b284238db",3:"c3b5d44657dc5ac68265",4:"59afc6b09559f1ebc067",5:"40821382b68441cb50f0",6:"00b931389a74250125a3",7:"2d8d6e52a6ac43313122",8:"ccfd1bb81626da46f432",9:"b916c8d12141617e4db2",10:"84a1849b0202f4273f23",11:"48cce40bd1119cfef79d",12:"8a1633b353b37d5bfcd2",13:"462b158420af9109c2c4",14:"94920536d81601122060",15:"35d29be8ae21328d7a1a",16:"7016f834cadae9b57028",17:"2c76434ec01b2b5ee02f",18:"d07d6af2aa0d5ee86261",19:"7ed28ae00b8809d6d671",20:"8f48037229efe39f46f1",21:"2103d8428d4f707fa369",22:"dec9447a8c45f2a2c7bb",23:"bd9202e3991ee39668e6",24:"54f2906c51709913d672",25:"4f9db49437ea94436d03",26:"1649432938888d71b3c9",27:"67137144c98b28cc5a30",28:"140ad99228544036c969",29:"30037b5674e7675b1da7",30:"fa0e0e20a9883b94be73",31:"a8e20732b0b0f62f5c5a",32:"509f0e1d73c3190be53a",33:"d649a5e4d061985d1c3a",34:"4977e6b9167f796404b9",35:"718d90637b7e54754f31",36:"6b7ba3c82f569f7a47e0",37:"f8bf84592943c5dfbf8a",38:"db0ccdb9d831a1fee238",39:"8861e4489f26fe322990",40:"c6cf553f8eb155ae6f1a",41:"119ab10f2d353ddcdbc8",42:"3cda7effdd6238c3e2d9",43:"afd187ba0590923ba9e5",44:"77199a317327d7ebcf4b",45:"5b64fee2aa3e6c3e3fc9",46:"588053d1bdb79f78028d",47:"e53a7b3b284d29858fae",48:"75da586a106599c730c1",49:"028b1255269b880f351b",50:"4289d8f282974207066c",51:"98c3602fc3a9ab54693a",52:"5ea13e39ab6e51a9054f",53:"5232792298264e487629",54:"4749eb7f37153ac94005",55:"bea6622b77dd0e24b535",56:"a2faa30e5f1c6aeb57be",57:"9064c84ce91fad83fe44",58:"04dbe15e8a9576b15187",59:"b62232922e7ccdd7242e",60:"956a6a3b0b11e618bd1b",61:"c220c6bad221831a72f6",62:"f797b18bb14b4d79151b",63:"b05b4ec28d2829c54f65",64:"0be98c69b2be684d451f",65:"e069a6e1df52acf3f14f",66:"9f1afb5a13b54ea92a02",67:"d674abd10a01e3c004c8",68:"2189902bf2848c91608c",69:"4087b90ee08d0100519f",72:"e19aae5a21dcfad3391e"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var a=b[e];0!==a&&(a&&a[1](new Error("Loading chunk "+e+" failed.")),b[e]=void 0)}return n.onerror=n.onload=t,d.appendChild(n),c},f.m=e,f.c=c,f.d=function(e,a,c){f.o(e,a)||Object.defineProperty(e,a,{configurable:!1,enumerable:!0,get:c})},f.n=function(e){var a=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(a,"a",a),a},f.o=function(e,a){return Object.prototype.hasOwnProperty.call(e,a)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/views/contacts/storeFrame.vue
+++ b/src/views/contacts/storeFrame.vue
@@ -31,7 +31,7 @@
                <el-radio-button :label="2">店员视图</el-radio-button>
              </el-radio-group>
              <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">回收站（{{ recycleCount }}）</el-button>
              </a>
            </div>
            <div>
@@ -115,8 +115,7 @@ export default {
      disableBtn: true,
      storeStatus: '',
      storeType: '',
-      recycleList: [],
+      recycleCount: 0,
-      recycleBool: false,
      firstLevelId: '' // 第一层的分组id
    };
  },
@@ -208,8 +207,9 @@ export default {
     * 设置是否显示子成员
     */
    setChildMemberShow(show) {
-      this.showChildMember = show;
+      let that = this;
-      this.getStoreList();
+      that.showChildMember = show;
+      that.getStoreList();
    },
    /**
     * 获取树形分组数据
@@ -234,6 +234,7 @@ export default {
              return item.level == 0;
            });
            that.getStoreList();
+            that.getRecycle();
          } else {
            that.menuData = [];
            that.loading = false;
@@ -256,41 +257,32 @@ export default {
    getStoreList() {
      let that = this;
      that.loading = true;
      let params = {
        storeGroupId: that.groupInfo.departmentId,
        showChild: that.showChildMember * 1,
-        showType: that.tableView,
+        showType: that.tableView, // 门店、店员视图
        pageSize: that.pageSize,
        pageNum: that.pageNumber,
-        status: that.recycleBool ? 4 : that.storeStatus,
+        status: that.storeStatus,
        storeType: that.storeType
      };
      getRequest('/haoban-manage-web/store/findSimplePage', params)
        .then(res => {
          if (res.data.errorCode == 1) {
            that.loading = false;
-            if (params.status == 4) {
+            that.total = res.data.result.total;
-              // 获取回收站列表数据
+            // 增加删除 popover 参数
-              that.recycleList = res.data.result.list || [];
+            if (!!res.data.result.list && !!res.data.result.list.length) {
-              that.recycleBool = false;
+              res.data.result.list.forEach(function(ele, index) {
-            } else {
+                ele.popVisible = false;
-              that.total = res.data.result.total;
+                if (!!ele.clerks && !!ele.clerks.length) {
-              // 增加删除 popover 参数
+                  ele.clerks.forEach(function(el, key) {
-              if (!!res.data.result.list && !!res.data.result.list.length) {
+                    el.popVisible = false;
-                res.data.result.list.forEach(function(ele, index) {
+                  });
-                  ele.popVisible = false;
+                }
-                  if (!!ele.clerks && !!ele.clerks.length) {
+              });
-                    ele.clerks.forEach(function(el, key) {
-                      el.popVisible = false;
-                    });
-                  }
-                });
-              }
-              that.storeList = res.data.result.list || [];
-              that.recycleBool = true; // 为了获取门店回收站数量
-              that.getStoreList();
            }
+            that.storeList = res.data.result.list || [];
          } else {
            that.loading = false;
            that.storeList = [];
@@ -321,7 +313,7 @@ export default {
      this.groupInfo.level = obj.level;
      this.storeStatus = '';
      this.getStoreList();
-      this.recycleListBtn();
+      this.getRecycle();
    },
    /**
     * 店员视图根据店铺状态筛选店铺
@@ -343,15 +335,35 @@ export default {
        this.showEmployee = '';
      }
    },
-    // 回收站
-    recycleListBtn() {
+    // 获取回收站
-      this.storeStatus = 4;
+    getRecycle() {
-      this.getStoreList();
+      let that = this;
+      let params = {
+        storeGroupId: that.groupInfo.departmentId
+      };
+      getRequest('/haoban-manage-web/store/get-recycle-count', params)
+        .then(res => {
+          let resData = res.data;
+          if (resData.errorCode == 1) {
+            that.recycleCount = resData.result;
+          } else {
+            that.$message.error({
+              duration: 1000,
+              message: resData.message
+            });
+          }
+        })
+        .catch(e => {
+          that.$message.error({
+            duration: 1000,
+            message: e.message
+          });
+        });
    }
  },
  beforeMount() {
    this.getGroupData();
-    // this.recycleListBtn(); // 获取回收站数量
  },
  mounted() {
    this.disableBtn = false;