Skip to content

H
haoban-4
Commit 98cda983 by 无尘
Options

fix: 修改授权逻辑

parent edfa8d67
Showing with 58 additions and 37 deletions
dist/css/chunk-aa1934dc.f09a3777.css → dist/css/chunk-27cca3c0.9e003580.css
.navwrap[data-v-69bcb2f7]{padding:12px 20px}.boxbttom[data-v-69bcb2f7],.boxshow[data-v-69bcb2f7]{border-bottom:1px solid #e4e7ed}.boxshow[data-v-69bcb2f7]{-webkit-box-shadow:5px -1px 5px #dfdfdf;box-shadow:5px -1px 5px #dfdfdf}.navtitle[data-v-69bcb2f7]{margin:24px 0 0 0;font-size:20px;color:#303133;font-weight:500}.navtip[data-v-69bcb2f7]{width:100%;height:38px;line-height:38px;font-size:13px;border-radius:2px;color:#606266;background-color:#f4f4f5}.navmTop[data-v-69bcb2f7]{margin-top:25px}.navtipcolor[data-v-69bcb2f7]{margin:0 12px;color:#2f54eb}.el-breadcrumb__inner.is-link[data-v-69bcb2f7]:hover,.el-breadcrumb__inner a[data-v-69bcb2f7]:hover{color:#2f54eb}.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7]:hover,.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7]:hover{font-weight:700;text-decoration:none;cursor:pointer;color:#303133}.line-h-18[data-v-1f450df8]{line-height:18px}.bg-f5f7fa[data-v-1f450df8]{background:#f5f7fa}.store-cell-ul[data-v-1f450df8]{height:289px;overflow-y:auto}.store-cell-ul li[data-v-1f450df8]{margin-top:10px}.line-h-18[data-v-0c8e3b34]{line-height:18px}.w-170[data-v-0c8e3b34]{width:170px}.my-customer-wrap[data-v-0c8e3b34]{height:100%}.right-content[data-v-0c8e3b34]{padding:0 20px 20px 20px;min-height:calc(100% - 160px)}.right-content .right-box[data-v-0c8e3b34]{background:#fff;min-height:500px;padding:0}.right-content .right-box .apps-content .apps-content-right[data-v-0c8e3b34]{width:100%;padding:20px;background:#fff}.right-content .right-box .apps-content .apps-content-right .common-set-wrap[data-v-0c8e3b34]{height:100%;background:#fff} .navwrap[data-v-69bcb2f7]{padding:12px 20px}.boxbttom[data-v-69bcb2f7],.boxshow[data-v-69bcb2f7]{border-bottom:1px solid #e4e7ed}.boxshow[data-v-69bcb2f7]{-webkit-box-shadow:5px -1px 5px #dfdfdf;box-shadow:5px -1px 5px #dfdfdf}.navtitle[data-v-69bcb2f7]{margin:24px 0 0 0;font-size:20px;color:#303133;font-weight:500}.navtip[data-v-69bcb2f7]{width:100%;height:38px;line-height:38px;font-size:13px;border-radius:2px;color:#606266;background-color:#f4f4f5}.navmTop[data-v-69bcb2f7]{margin-top:25px}.navtipcolor[data-v-69bcb2f7]{margin:0 12px;color:#2f54eb}.el-breadcrumb__inner.is-link[data-v-69bcb2f7]:hover,.el-breadcrumb__inner a[data-v-69bcb2f7]:hover{color:#2f54eb}.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7]:hover,.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7]:hover{font-weight:700;text-decoration:none;cursor:pointer;color:#303133}.line-h-18[data-v-1f450df8]{line-height:18px}.bg-f5f7fa[data-v-1f450df8]{background:#f5f7fa}.store-cell-ul[data-v-1f450df8]{height:289px;overflow-y:auto}.store-cell-ul li[data-v-1f450df8]{margin-top:10px}.line-h-18[data-v-2be1c32e]{line-height:18px}.w-170[data-v-2be1c32e]{width:170px}.my-customer-wrap[data-v-2be1c32e]{height:100%}.right-content[data-v-2be1c32e]{padding:0 20px 20px 20px;min-height:calc(100% - 160px)}.right-content .right-box[data-v-2be1c32e]{background:#fff;min-height:500px;padding:0}.right-content .right-box .apps-content .apps-content-right[data-v-2be1c32e]{width:100%;padding:20px;background:#fff}.right-content .right-box .apps-content .apps-content-right .common-set-wrap[data-v-2be1c32e]{height:100%;background:#fff}
\ No newline at end of file \ No newline at end of file
dist/css/chunk-012f395e.d11e9162.css → dist/css/chunk-780959ba.0de09ea4.css
.navwrap[data-v-69bcb2f7]{padding:12px 20px}.boxbttom[data-v-69bcb2f7],.boxshow[data-v-69bcb2f7]{border-bottom:1px solid #e4e7ed}.boxshow[data-v-69bcb2f7]{-webkit-box-shadow:5px -1px 5px #dfdfdf;box-shadow:5px -1px 5px #dfdfdf}.navtitle[data-v-69bcb2f7]{margin:24px 0 0 0;font-size:20px;color:#303133;font-weight:500}.navtip[data-v-69bcb2f7]{width:100%;height:38px;line-height:38px;font-size:13px;border-radius:2px;color:#606266;background-color:#f4f4f5}.navmTop[data-v-69bcb2f7]{margin-top:25px}.navtipcolor[data-v-69bcb2f7]{margin:0 12px;color:#2f54eb}.el-breadcrumb__inner.is-link[data-v-69bcb2f7]:hover,.el-breadcrumb__inner a[data-v-69bcb2f7]:hover{color:#2f54eb}.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7]:hover,.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7]:hover{font-weight:700;text-decoration:none;cursor:pointer;color:#303133}.span-dot[data-v-b45b08da]{display:inline-block;vertical-align:middle;width:6px;height:6px;margin-right:6px;border-radius:3px}.span-dot.bg-52c41a[data-v-b45b08da]{background:#52c41a}.span-dot.bg-f5222d[data-v-b45b08da]{background:#f5222d}.bg-82C5FF[data-v-b45b08da]{background:#82c5ff}.color-508CEE[data-v-b45b08da]{color:#508cee}.color-FF585C[data-v-b45b08da]{color:#ff585c}.line-h-18[data-v-b45b08da]{line-height:18px}.tooltip-text[data-v-b45b08da]{width:100%;white-space:pre-wrap;word-break:break-all}.w-293[data-v-b45b08da]{width:293px}.w-191[data-v-b45b08da]{width:191px}.common-bottom-border[data-v-b45b08da]{cursor:pointer;padding-bottom:2px;border-bottom:1px dashed #2f54eb}.my-customer-wrap[data-v-b45b08da]{height:100%}.right-content[data-v-b45b08da]{padding:0 20px 20px 20px;min-height:calc(100% - 160px)}.right-content .right-box[data-v-b45b08da]{background:#fff;min-height:500px;padding:0}.right-content .right-box .apps-content .apps-content-right[data-v-b45b08da]{width:100%;padding:20px;background:#fff}.right-content .right-box .apps-content .apps-content-right .common-set-wrap[data-v-b45b08da]{height:100%;background:#fff}.ul-li-cell .cell-img[data-v-b45b08da]{width:40px;min-width:40px;max-width:40px;height:40px;border-radius:2px;border:1px solid #e4e7ed;-webkit-box-sizing:border-box;box-sizing:border-box}.ul-li-cell .cell-img img[data-v-b45b08da]{width:100%}.ul-li-cell .cell-info[data-v-b45b08da]{padding-left:10px;-webkit-box-sizing:border-box;box-sizing:border-box}.ul-li-cell .cell-info .cell-info-name[data-v-b45b08da]{height:40px;line-height:19px;white-space:pre-wrap;word-break:break-all}.ul-li-cell .cell-info .gic-name[data-v-b45b08da]{font-size:14px;color:#303133;line-height:18px}.ul-li-cell .cell-info .gic-version[data-v-b45b08da]{display:inline-block;padding:0 5px;height:15px;line-height:15px;margin-left:5px;background:#fff1f0;border-radius:2px;border:1px solid #ffa39e;font-size:10px;color:#f5222d} .navwrap[data-v-69bcb2f7]{padding:12px 20px}.boxbttom[data-v-69bcb2f7],.boxshow[data-v-69bcb2f7]{border-bottom:1px solid #e4e7ed}.boxshow[data-v-69bcb2f7]{-webkit-box-shadow:5px -1px 5px #dfdfdf;box-shadow:5px -1px 5px #dfdfdf}.navtitle[data-v-69bcb2f7]{margin:24px 0 0 0;font-size:20px;color:#303133;font-weight:500}.navtip[data-v-69bcb2f7]{width:100%;height:38px;line-height:38px;font-size:13px;border-radius:2px;color:#606266;background-color:#f4f4f5}.navmTop[data-v-69bcb2f7]{margin-top:25px}.navtipcolor[data-v-69bcb2f7]{margin:0 12px;color:#2f54eb}.el-breadcrumb__inner.is-link[data-v-69bcb2f7]:hover,.el-breadcrumb__inner a[data-v-69bcb2f7]:hover{color:#2f54eb}.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner[data-v-69bcb2f7]:hover,.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7],.el-breadcrumb__item:last-child .el-breadcrumb__inner a[data-v-69bcb2f7]:hover{font-weight:700;text-decoration:none;cursor:pointer;color:#303133}.span-dot[data-v-276c343e]{display:inline-block;vertical-align:middle;width:6px;height:6px;margin-right:6px;border-radius:3px}.span-dot.bg-52c41a[data-v-276c343e]{background:#52c41a}.span-dot.bg-f5222d[data-v-276c343e]{background:#f5222d}.bg-82C5FF[data-v-276c343e]{background:#82c5ff}.color-508CEE[data-v-276c343e]{color:#508cee}.color-FF585C[data-v-276c343e]{color:#ff585c}.line-h-18[data-v-276c343e]{line-height:18px}.tooltip-text[data-v-276c343e]{width:100%;white-space:pre-wrap;word-break:break-all}.w-293[data-v-276c343e]{width:293px}.w-191[data-v-276c343e]{width:191px}.common-bottom-border[data-v-276c343e]{cursor:pointer;padding-bottom:2px;border-bottom:1px dashed #2f54eb}.my-customer-wrap[data-v-276c343e]{height:100%}.right-content[data-v-276c343e]{padding:0 20px 20px 20px;min-height:calc(100% - 160px)}.right-content .right-box[data-v-276c343e]{background:#fff;min-height:500px;padding:0}.right-content .right-box .apps-content .apps-content-right[data-v-276c343e]{width:100%;padding:20px;background:#fff}.right-content .right-box .apps-content .apps-content-right .common-set-wrap[data-v-276c343e]{height:100%;background:#fff}.ul-li-cell .cell-img[data-v-276c343e]{width:40px;min-width:40px;max-width:40px;height:40px;border-radius:2px;border:1px solid #e4e7ed;-webkit-box-sizing:border-box;box-sizing:border-box}.ul-li-cell .cell-img img[data-v-276c343e]{width:100%}.ul-li-cell .cell-info[data-v-276c343e]{padding-left:10px;-webkit-box-sizing:border-box;box-sizing:border-box}.ul-li-cell .cell-info .cell-info-name[data-v-276c343e]{height:40px;line-height:19px;white-space:pre-wrap;word-break:break-all}.ul-li-cell .cell-info .gic-name[data-v-276c343e]{font-size:14px;color:#303133;line-height:18px}.ul-li-cell .cell-info .gic-version[data-v-276c343e]{display:inline-block;padding:0 5px;height:15px;line-height:15px;margin-left:5px;background:#fff1f0;border-radius:2px;border:1px solid #ffa39e;font-size:10px;color:#f5222d}
\ No newline at end of file \ No newline at end of file
dist/index.html
<!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.39.css><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><title>好办</title><link href=css/chunk-012f395e.d11e9162.css rel=prefetch><link href=css/chunk-08cf78ee.9cb54b4c.css rel=prefetch><link href=css/chunk-16a8dcde.2a3bfb87.css rel=prefetch><link href=css/chunk-19db1fc6.ba890a33.css rel=prefetch><link href=css/chunk-1a973c84.759ba998.css rel=prefetch><link href=css/chunk-1b93a01a.01549a8d.css rel=prefetch><link href=css/chunk-2ad47fe6.9010b5cb.css rel=prefetch><link href=css/chunk-3f8ce3a6.3d609251.css rel=prefetch><link href=css/chunk-4a8be49a.e6fc8e8f.css rel=prefetch><link href=css/chunk-63cd2773.5fbdcef6.css rel=prefetch><link href=css/chunk-63f006ce.8845f3f9.css rel=prefetch><link href=css/chunk-6ddaf340.1af72f05.css rel=prefetch><link href=css/chunk-7756bb34.84a9ca44.css rel=prefetch><link href=css/chunk-7ea1f4c1.2edbc58c.css rel=prefetch><link href=css/chunk-8da245a2.0d5615a8.css rel=prefetch><link href=css/chunk-aa1934dc.f09a3777.css rel=prefetch><link href=css/chunk-aef383e6.eec4d489.css rel=prefetch><link href=css/chunk-be528a18.e2991b7b.css rel=prefetch><link href=css/chunk-c81e0272.60eaec0d.css rel=prefetch><link href=css/chunk-ea9d6bee.492c0f7d.css rel=prefetch><link href=js/chunk-012f395e.dc476348.js rel=prefetch><link href=js/chunk-08cf78ee.ce8918f8.js rel=prefetch><link href=js/chunk-16a8dcde.422b0989.js rel=prefetch><link href=js/chunk-19db1fc6.10fbf935.js rel=prefetch><link href=js/chunk-1a973c84.ec54956a.js rel=prefetch><link href=js/chunk-1b93a01a.19b25334.js rel=prefetch><link href=js/chunk-2ad47fe6.f8bd0da9.js rel=prefetch><link href=js/chunk-2d0b5d69.68a52501.js rel=prefetch><link href=js/chunk-3f8ce3a6.407d94d5.js rel=prefetch><link href=js/chunk-4a8be49a.279f41dc.js rel=prefetch><link href=js/chunk-63cd2773.7c931d9c.js rel=prefetch><link href=js/chunk-63f006ce.e449905e.js rel=prefetch><link href=js/chunk-6ddaf340.b4ce1a5f.js rel=prefetch><link href=js/chunk-737eaf4a.50394394.js rel=prefetch><link href=js/chunk-7756bb34.26c7cf89.js rel=prefetch><link href=js/chunk-7ea1f4c1.fd6c8daa.js rel=prefetch><link href=js/chunk-8da245a2.30d70f2a.js rel=prefetch><link href=js/chunk-aa1934dc.b0ad31c7.js rel=prefetch><link href=js/chunk-aef383e6.5faa3612.js rel=prefetch><link href=js/chunk-be528a18.ba45b8c3.js rel=prefetch><link href=js/chunk-c81e0272.b6b73d30.js rel=prefetch><link href=js/chunk-ea9d6bee.51f6b850.js rel=prefetch><link href=css/app.b8ea1a4d.css rel=preload as=style><link href=css/chunk-vendors.635bc84a.css rel=preload as=style><link href=js/app.d172fca5.js rel=preload as=script><link href=js/chunk-vendors.e7b30cab.js rel=preload as=script><link href=css/chunk-vendors.635bc84a.css rel=stylesheet><link href=css/app.b8ea1a4d.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.41.js></script><script src=js/chunk-vendors.e7b30cab.js></script><script src=js/app.d172fca5.js></script></body></html> <!DOCTYPE html><html lang=cn><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=favicon.ico><link rel=stylesheet type=text/css href=//web-1251519181.file.myqcloud.com/custom-element/custom-element.1.0.39.css><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><title>好办</title><link href=css/chunk-08cf78ee.9cb54b4c.css rel=prefetch><link href=css/chunk-16a8dcde.2a3bfb87.css rel=prefetch><link href=css/chunk-19db1fc6.ba890a33.css rel=prefetch><link href=css/chunk-1a973c84.759ba998.css rel=prefetch><link href=css/chunk-1b93a01a.01549a8d.css rel=prefetch><link href=css/chunk-27cca3c0.9e003580.css rel=prefetch><link href=css/chunk-2ad47fe6.9010b5cb.css rel=prefetch><link href=css/chunk-2edfeeab.49caf26e.css rel=prefetch><link href=css/chunk-3f8ce3a6.3d609251.css rel=prefetch><link href=css/chunk-4a8be49a.e6fc8e8f.css rel=prefetch><link href=css/chunk-63cd2773.5fbdcef6.css rel=prefetch><link href=css/chunk-63f006ce.8845f3f9.css rel=prefetch><link href=css/chunk-7756bb34.84a9ca44.css rel=prefetch><link href=css/chunk-780959ba.0de09ea4.css rel=prefetch><link href=css/chunk-7ea1f4c1.2edbc58c.css rel=prefetch><link href=css/chunk-8da245a2.0d5615a8.css rel=prefetch><link href=css/chunk-aef383e6.eec4d489.css rel=prefetch><link href=css/chunk-be528a18.e2991b7b.css rel=prefetch><link href=css/chunk-c81e0272.60eaec0d.css rel=prefetch><link href=css/chunk-ea9d6bee.492c0f7d.css rel=prefetch><link href=js/chunk-08cf78ee.ce8918f8.js rel=prefetch><link href=js/chunk-16a8dcde.422b0989.js rel=prefetch><link href=js/chunk-19db1fc6.10fbf935.js rel=prefetch><link href=js/chunk-1a973c84.ec54956a.js rel=prefetch><link href=js/chunk-1b93a01a.19b25334.js rel=prefetch><link href=js/chunk-27cca3c0.526406f4.js rel=prefetch><link href=js/chunk-2ad47fe6.f8bd0da9.js rel=prefetch><link href=js/chunk-2d0b5d69.68a52501.js rel=prefetch><link href=js/chunk-2edfeeab.44d9f7c0.js rel=prefetch><link href=js/chunk-3f8ce3a6.407d94d5.js rel=prefetch><link href=js/chunk-4a8be49a.279f41dc.js rel=prefetch><link href=js/chunk-63cd2773.7c931d9c.js rel=prefetch><link href=js/chunk-63f006ce.e449905e.js rel=prefetch><link href=js/chunk-737eaf4a.50394394.js rel=prefetch><link href=js/chunk-7756bb34.26c7cf89.js rel=prefetch><link href=js/chunk-780959ba.504a351b.js rel=prefetch><link href=js/chunk-7ea1f4c1.fd6c8daa.js rel=prefetch><link href=js/chunk-8da245a2.30d70f2a.js rel=prefetch><link href=js/chunk-aef383e6.5faa3612.js rel=prefetch><link href=js/chunk-be528a18.ba45b8c3.js rel=prefetch><link href=js/chunk-c81e0272.b6b73d30.js rel=prefetch><link href=js/chunk-ea9d6bee.51f6b850.js rel=prefetch><link href=css/app.b8ea1a4d.css rel=preload as=style><link href=css/chunk-vendors.635bc84a.css rel=preload as=style><link href=js/app.2eb34a7b.js rel=preload as=script><link href=js/chunk-vendors.e7b30cab.js rel=preload as=script><link href=css/chunk-vendors.635bc84a.css rel=stylesheet><link href=css/app.b8ea1a4d.css rel=stylesheet></head><body class=damolish><noscript><strong>We're sorry but damolish doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vue/2.6.10/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/vuex/3.0.1/vuex.js></script><script src=//web-1251519181.file.myqcloud.com/lib-4.0/axios/0.19.0/axios.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/layout.1.2.41.js></script><script src=js/chunk-vendors.e7b30cab.js></script><script src=js/app.2eb34a7b.js></script></body></html>
\ No newline at end of file \ No newline at end of file
src/components/company/store-auth-dialog.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-07-21 10:10:57 * @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-28 18:04:49 * @LastEditTime: 2020-07-29 11:33:58
--> -->
<!-- <!--
授权选择门店绑定弹窗 授权选择门店绑定弹窗
...@@ -140,7 +140,7 @@ export default { ...@@ -140,7 +140,7 @@ export default {
checkGroupIds: function(nodes) { checkGroupIds: function(nodes) {
const that = this; const that = this;
console.log(nodes); console.log(nodes);
that.selectGroupData = JSON.parse(JSON.stringify(nodes)); // that.selectGroupData = JSON.parse(JSON.stringify(nodes));
that.formData.selectList = JSON.parse(JSON.stringify(nodes)); that.formData.selectList = JSON.parse(JSON.stringify(nodes));
}, },
/** /**
...@@ -148,7 +148,7 @@ export default { ...@@ -148,7 +148,7 @@ export default {
*/ */
checkStoreIds: function(nodes) { checkStoreIds: function(nodes) {
const that = this; const that = this;
that.selectStoreData = JSON.parse(JSON.stringify(nodes)); // that.selectStoreData = JSON.parse(JSON.stringify(nodes));
that.formData.selectList = JSON.parse(JSON.stringify(nodes)); that.formData.selectList = JSON.parse(JSON.stringify(nodes));
}, },
/** /**
...@@ -156,20 +156,13 @@ export default { ...@@ -156,20 +156,13 @@ export default {
*/ */
submitForm() { submitForm() {
const that = this; const that = this;
if (that.formData.sendRange == '1' && !that.selectGroupData.length) { if (that.formData.sendRange == '1' && !that.formData.selectList.length) {
return false; return false;
} }
if (that.formData.sendRange == '2' && !that.selectStoreData.length) { if (that.formData.sendRange == '2' && !that.formData.selectList.length) {
return false; return false;
} }
let arr = [] that.$emit('closeSet', String(that.formData.sendRange), that.formData.selectList);
if (that.formData.sendRange == '1') {
arr = that.selectGroupData;
}
if (that.formData.sendRange == '2') {
arr = that.selectStoreData;
}
that.$emit('closeSet', String(that.formData.sendRange), arr);
} }
}, },
components: { components: {
......
src/components/company/store-auth-group.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2020-07-21 10:10:57 * @Date: 2020-07-21 10:10:57
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-28 18:02:28 * @LastEditTime: 2020-07-29 11:47:56
--> -->
<!-- <!--
门店绑定-选择分组 门店绑定-选择分组
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<el-input placeholder="请输入分组名称" clearable v-model="searchSelect" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input> <el-input placeholder="请输入分组名称" clearable v-model="searchSelect" @keyup.native="value => toInput(value, searchSelect)" @clear="clearSearch"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
</div> </div>
<div class="select-tree-wrap m-t-20"> <div class="select-tree-wrap m-t-20">
<el-tree ref="groupTree" :filter-node-method="filterNode" :data="groupData" node-key="storeGroupId" lazy show-checkbox default-expand-all :props="defaultProps" :expand-on-click-node="false" @check="checkGroup"> <el-tree ref="groupTree" :filter-node-method="filterNode" check-strictly :data="groupData" node-key="storeGroupId" show-checkbox default-expand-all :props="defaultProps" :expand-on-click-node="false" @check="checkGroup">
<span :id="data.storeGroupId" class="custom-tree-node" slot-scope="{ node, data }" @click="toShowMsg(node, data)"> <span :id="data.storeGroupId" class="custom-tree-node" slot-scope="{ node, data }" @click="toShowMsg(node, data)">
<span class="font-14 color-606266">{{ node.label }}</span><span v-if="data.bindFlag == 1" class="font-12 color-909399">{{ data.bindWxEnterpriseName }} 企业已授权</span> <span class="font-14 color-606266">{{ node.label }}</span><span v-if="data.bindFlag == 1" class="font-12 color-909399">{{ data.bindWxEnterpriseName }} 企业已授权</span>
</span> </span>
...@@ -105,8 +105,8 @@ export default { ...@@ -105,8 +105,8 @@ export default {
that.groupData = JSON.parse(JSON.stringify(that.groupDataCopy)); that.groupData = JSON.parse(JSON.stringify(that.groupDataCopy));
}, },
/** /**
* 选择 tree 节点,获取选择节点信息 * 选择 tree 节点,获取选择节点信息
*/ */
checkGroup: function(e, checkedKeys) { checkGroup: function(e, checkedKeys) {
const that = this; const that = this;
if (that.storeType == 2) { if (that.storeType == 2) {
...@@ -127,15 +127,19 @@ export default { ...@@ -127,15 +127,19 @@ export default {
document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.borderColor = '#dcdfe6'; document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.borderColor = '#dcdfe6';
document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.backgroundColor = '#ffffff'; document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.backgroundColor = '#ffffff';
} */ } */
console.log(checkFlag)
that.$refs.groupTree.setChecked(e.storeGroupId,checkFlag,true) that.$refs.groupTree.setChecked(e.storeGroupId,checkFlag,true)
e.children.forEach(ele => { e.children.forEach(ele => {
that.$refs.groupTree.setChecked(ele.storeGroupId,checkFlag,true); that.$refs.groupTree.setChecked(ele.storeGroupId,checkFlag,true);
if (checkFlag) { if (checkFlag) {
ele.disabled = true; ele.disabled = true;
}else { }else {
ele.disabled = ele.useFlag ? true :false; ele.disabled = ele.bindFlag ? true :false;
} }
// 递归子级禁用和选中 // 递归子级禁用和选中
if (!!ele.children && !!ele.children.length) {
that.checkChild(ele, checkFlag);
}
}); });
} }
// 这里还要过滤已选的数据，把非禁用的数据过滤出来 // 这里还要过滤已选的数据，把非禁用的数据过滤出来
...@@ -152,6 +156,24 @@ export default { ...@@ -152,6 +156,24 @@ export default {
that.$emit('checkGroupIds', []); that.$emit('checkGroupIds', []);
} }
}, },
/**
* checkchild
*/
checkChild(arr,checkFlag) {
const that = this;
arr.children.forEach(ele => {
that.$refs.groupTree.setChecked(ele.storeGroupId,checkFlag,true);
if (checkFlag) {
ele.disabled = true;
}else {
ele.disabled = ele.bindFlag ? true :false;
}
// 递归子级禁用和选中
if (!!ele.children && !!ele.children.length) {
that.checkChild(ele, checkFlag);
}
})
},
treeData(data) { treeData(data) {
let tree = data.filter(father => { let tree = data.filter(father => {
//循环所有项 //循环所有项
...@@ -162,10 +184,12 @@ export default { ...@@ -162,10 +184,12 @@ export default {
father.hasSonNode = true; father.hasSonNode = true;
father.children = branchArr; //如果存在子级，则给父级添加一个children属性，并赋值 father.children = branchArr; //如果存在子级，则给父级添加一个children属性，并赋值
} else { } else {
father.children = []
father.hasSonNode = false; father.hasSonNode = false;
} }
return father.parentId == 0; //返回第一层 return father.parentId == 0; //返回第一层
}); });
console.log(tree);
return tree; return tree;
}, },
...@@ -185,11 +209,13 @@ export default { ...@@ -185,11 +209,13 @@ export default {
res.result.forEach(ele => { res.result.forEach(ele => {
ele.expand = false; ele.expand = false;
ele.children = []; ele.children = [];
ele.disabled = ele.bindFlag == 1? true : false;
ele.label = ele.storeGroupName; ele.label = ele.storeGroupName;
}); });
} }
that.groupData = await that.treeData(JSON.parse(JSON.stringify(res.result))) || []; that.groupData = await that.treeData(JSON.parse(JSON.stringify(res.result))) || [];
// 存一份数据自己搜索 // 存一份数据自己搜索
console.log(that.groupData)
that.groupDataCopy = JSON.parse(JSON.stringify(res.result)); that.groupDataCopy = JSON.parse(JSON.stringify(res.result));
}) })
.catch(function(error) { .catch(function(error) {
...@@ -226,7 +252,10 @@ export default { ...@@ -226,7 +252,10 @@ export default {
.select-tree-wrap { .select-tree-wrap {
height: 323px; height: 323px;
overflow-y: auto; overflow-y: auto;
.el-tree {
width: 309px;
overflow-x: auto;
}
} }
} }
......
src/views/business/audit-log.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-27 18:16:54 * @LastEditTime: 2020-07-29 12:25:44
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -29,12 +29,11 @@ ...@@ -29,12 +29,11 @@
<div class="m-t-20"> <div class="m-t-20">
<el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }"> <el-table class="select-table" ref="multipleTable" :data="tableData" tooltip-effect="dark" :style="{ width: '100%', minHeight: tableH }">
<el-table-column label="申请事项" show-overflow-tooltip> <el-table-column label="申请事项" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.userName }}</template> <template slot-scope="scope">{{ scope.row.userName || '--' }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="申请理由" show-overflow-tooltip> <el-table-column prop="" label="申请理由" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="line-18">{{ scope.row.createTime | timeStampToYmd }}</div> {{ scope.row.auditReason || '--' }}
<div class="line-18">{{ scope.row.createTime | timeStampToHms }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="门店绑定" show-overflow-tooltip> <el-table-column prop="" label="门店绑定" show-overflow-tooltip>
...@@ -48,7 +47,7 @@ ...@@ -48,7 +47,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="" label="提交人" show-overflow-tooltip> <el-table-column prop="" label="提交人" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.taskDesc | '--' }} {{ scope.row.referStaffName | '--' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="审核人" show-overflow-tooltip> <el-table-column prop="" label="审核人" show-overflow-tooltip>
...@@ -57,13 +56,13 @@ ...@@ -57,13 +56,13 @@
<el-table-column prop="" label="审核结果" show-overflow-tooltip> <el-table-column prop="" label="审核结果" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.taskDesc | '--' }}</template> <template slot-scope="scope">{{ scope.row.taskDesc | '--' }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="审核时间" show-overflow-tooltip> <el-table-column prop="" label="审核时间">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="line-18">{{ scope.row.createTime | timeStampToYmd }}</div> <div class="line-18">{{ scope.row.createTime | timeStampToYmd }} {{ !scope.row.createTime ? '--':'' }}</div>
<div class="line-18">{{ scope.row.createTime | timeStampToHms }}</div> <div class="line-18">{{ scope.row.createTime | timeStampToHms }} {{ !scope.row.createTime ? '--':'' }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip> <el-table-column prop="" label="操作" width="203">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="toShowLog(scope.$index, scope.row)">绑定详情</el-button> <el-button type="text" @click="toShowLog(scope.$index, scope.row)">绑定详情</el-button>
<el-button type="text" @click="toCancleAudit(scope.$index, scope.row)">取消审核</el-button> <el-button type="text" @click="toCancleAudit(scope.$index, scope.row)">取消审核</el-button>
...@@ -119,7 +118,7 @@ export default { ...@@ -119,7 +118,7 @@ export default {
total: 0, total: 0,
tableData: [], tableData: [],
// 绑定详情 // 绑定详情
logShow: true, logShow: false,
storeRangeAuditId: '' storeRangeAuditId: ''
}; };
}, },
......
src/views/business/auth-merchant.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Author: 无尘 * @Author: 无尘
* @Date: 2019-03-20 14:36:37 * @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘 * @LastEditors: 无尘
* @LastEditTime: 2020-07-27 18:16:30 * @LastEditTime: 2020-07-29 12:17:48
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<div class="line-18">{{ scope.row.updateTime | timeStampToHms }}</div> <div class="line-18">{{ scope.row.updateTime | timeStampToHms }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="操作" show-overflow-tooltip> <el-table-column prop="" label="操作" width="203">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click="toEdit(scope.$index, scope.row)">编辑授权设置</el-button> <el-button type="text" @click="toEdit(scope.$index, scope.row)">编辑授权设置</el-button>
<el-button type="text" @click="toAuditLog(scope.$index, scope.row)">审核日志</el-button> <el-button type="text" @click="toAuditLog(scope.$index, scope.row)">审核日志</el-button>
......
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