Skip to content

H
haoban-4
Commit edfa8d67 by 无尘
Options

fix: 修改授权流程

parent a17d020f
Showing with 56 additions and 33 deletions
dist/css/chunk-c81e0272.60eaec0d.css 0 → 100644
.input-line-cell[data-v-4edbc45f]{position:relative;display:inline-block}.input-line-cell.limit-color .input-cell-tip[data-v-4edbc45f]{color:hsla(0,0%,100%,.7)}.input-line-cell .input-cell-tip[data-v-4edbc45f]{position:absolute;top:2px;right:10px;display:inline-block;line-height:32px;text-align:right;font-size:12px;color:#c0c4cc}.w-340[data-v-4edbc45f]{width:340px}.w-340[data-v-4edbc45f] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.el-input[data-v-4edbc45f] .el-input__inner{font-size:14px;color:#606266;background-color:hsla(0,0%,100%,.1)}.el-input.is-disabled[data-v-4edbc45f]{opacity:.5}.el-input .is-disabled[data-v-4edbc45f] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.input-line-cell[data-v-2859c084]{position:relative;display:inline-block}.w-340[data-v-2859c084]{width:340px}.w-340[data-v-2859c084] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.el-textarea[data-v-2859c084] .el-textarea__inner{font-size:14px;color:#606266;background-color:hsla(0,0%,100%,.1);resize:none;font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,"\5FAE\8F6F\96C5\9ED1",Arial,sans-serif}.el-textarea.is-disabled[data-v-2859c084]{opacity:.5}.el-input .is-disabled[data-v-2859c084] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.tip[data-v-2859c084]{position:absolute;bottom:-5px;right:10px;display:inline-block;line-height:32px;text-align:right;font-size:12px;color:#909399}.w-440[data-v-f37e6472]{width:440px}.m-b-20[data-v-f37e6472]{margin-bottom:20px}.p-l-18[data-v-f37e6472]{padding-left:18px}.material-content[data-v-f37e6472]{position:relative}.el-textarea[data-v-f37e6472] .el-textarea__inner,.material-content .material-body .el-textarea[data-v-f37e6472] .el-textarea__inner{height:68px}.color-c0c4cc[data-v-6f727b6c]{display:inline-block;line-height:34px;padding-left:10px;color:#c0c4cc}.color-49c958[data-v-6f727b6c]{color:#49c958}.color-f83431[data-v-6f727b6c]{color:#f83431}.line-h-32[data-v-6f727b6c]{line-height:32px}.condition-tips[data-v-6f727b6c]{display:inline-block;vertical-align:middle;line-height:32px}.w-127[data-v-6f727b6c]{width:127px}.w-399[data-v-6f727b6c]{width:399px}.p-l-5[data-v-6f727b6c]{padding-left:5px}.p-l-15[data-v-6f727b6c]{padding-left:15px}.p-l-130[data-v-6f727b6c]{padding-left:130px}.p-l-137[data-v-6f727b6c]{padding-left:137px}.m-l-20[data-v-6f727b6c]{margin-left:20px}.m-l-37[data-v-6f727b6c]{margin-left:37px}.m-l-137[data-v-6f727b6c]{margin-left:137px}.m-b-20[data-v-6f727b6c]{margin-bottom:20px}.m-t-30[data-v-6f727b6c]{margin-top:30px}.secret-cell[data-v-6f727b6c]{position:relative}.secret-cell .common-bottom-border[data-v-6f727b6c]{cursor:pointer;padding-bottom:2px;border-bottom:1px dashed #2f54eb}.secret-cell .self-app-info[data-v-6f727b6c]{width:545px}.secret-cell .self-app-info .self-app-item[data-v-6f727b6c]{height:32px;line-height:32px}.secret-cell .self-app-info .self-app-item.secret-name[data-v-6f727b6c]{border-bottom:1px solid #e4e7ed}.secret-cell .add-self-app[data-v-6f727b6c]{width:98px;height:32px;line-height:32px;margin-left:20px;text-align:center;border:1px solid #c0c4cc}.secret-cell .add-self-app[data-v-6f727b6c]:hover{border-color:#2f54eb}.secret-cell .add-self-app:hover span[data-v-6f727b6c]{color:#2f54eb}.add-cell[data-v-6f727b6c]{height:43px;line-height:43px;border-bottom:1px solid #dcdfe6}.add-cell:hover .add-cell-txt[data-v-6f727b6c]{color:#597ef7}.daily-set-wrap[data-v-6f727b6c]{height:100%}.daily-set-wrap .company-set-content[data-v-6f727b6c]{padding:20px}.daily-set-wrap .company-set-content .table-condition-left[data-v-6f727b6c]{font-size:0}.daily-set-wrap .el-form .el-form-item[data-v-6f727b6c]{margin-bottom:4px}.daily-set-wrap .el-form[data-v-6f727b6c] .el-form-item__label{color:#606266}.daily-set-wrap .depart-item-content[data-v-6f727b6c]{width:213px;height:32px;overflow:hidden;white-space:nowrap;border-radius:4px;border:1px solid #dcdfe6;cursor:pointer}.daily-set-wrap .item-cell-select[data-v-6f727b6c] .el-select__tags{white-space:nowrap;overflow:hidden}.daily-set-wrap .depart-cell[data-v-6f727b6c]{position:relative;margin:0 24px 24px 0}.daily-set-wrap .depart-cell .el-icon-circle-close[data-v-6f727b6c]{position:absolute;top:-10px;right:-10px;font-size:16px;color:#808995;cursor:pointer}
\ No newline at end of file
dist/css/chunk-deba06ea.2cad6e53.css deleted 100644 → 0
.input-line-cell[data-v-4edbc45f]{position:relative;display:inline-block}.input-line-cell.limit-color .input-cell-tip[data-v-4edbc45f]{color:hsla(0,0%,100%,.7)}.input-line-cell .input-cell-tip[data-v-4edbc45f]{position:absolute;top:2px;right:10px;display:inline-block;line-height:32px;text-align:right;font-size:12px;color:#c0c4cc}.w-340[data-v-4edbc45f]{width:340px}.w-340[data-v-4edbc45f] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.el-input[data-v-4edbc45f] .el-input__inner{font-size:14px;color:#606266;background-color:hsla(0,0%,100%,.1)}.el-input.is-disabled[data-v-4edbc45f]{opacity:.5}.el-input .is-disabled[data-v-4edbc45f] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.input-line-cell[data-v-2859c084]{position:relative;display:inline-block}.w-340[data-v-2859c084]{width:340px}.w-340[data-v-2859c084] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.el-textarea[data-v-2859c084] .el-textarea__inner{font-size:14px;color:#606266;background-color:hsla(0,0%,100%,.1);resize:none;font-family:Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,"\5FAE\8F6F\96C5\9ED1",Arial,sans-serif}.el-textarea.is-disabled[data-v-2859c084]{opacity:.5}.el-input .is-disabled[data-v-2859c084] .el-input__inner{font-size:14px;color:#fff;background-color:hsla(0,0%,100%,.1)}.tip[data-v-2859c084]{position:absolute;bottom:-5px;right:10px;display:inline-block;line-height:32px;text-align:right;font-size:12px;color:#909399}.w-440[data-v-f37e6472]{width:440px}.m-b-20[data-v-f37e6472]{margin-bottom:20px}.p-l-18[data-v-f37e6472]{padding-left:18px}.material-content[data-v-f37e6472]{position:relative}.el-textarea[data-v-f37e6472] .el-textarea__inner,.material-content .material-body .el-textarea[data-v-f37e6472] .el-textarea__inner{height:68px}.color-c0c4cc[data-v-5b395a3a]{display:inline-block;line-height:34px;padding-left:10px;color:#c0c4cc}.color-49c958[data-v-5b395a3a]{color:#49c958}.color-f83431[data-v-5b395a3a]{color:#f83431}.line-h-32[data-v-5b395a3a]{line-height:32px}.condition-tips[data-v-5b395a3a]{display:inline-block;vertical-align:middle;line-height:32px}.w-127[data-v-5b395a3a]{width:127px}.w-399[data-v-5b395a3a]{width:399px}.p-l-5[data-v-5b395a3a]{padding-left:5px}.p-l-130[data-v-5b395a3a]{padding-left:130px}.p-l-137[data-v-5b395a3a]{padding-left:137px}.m-l-20[data-v-5b395a3a]{margin-left:20px}.m-l-37[data-v-5b395a3a]{margin-left:37px}.m-l-137[data-v-5b395a3a]{margin-left:137px}.m-b-20[data-v-5b395a3a]{margin-bottom:20px}.m-t-30[data-v-5b395a3a]{margin-top:30px}.secret-cell[data-v-5b395a3a]{position:relative}.secret-cell .common-bottom-border[data-v-5b395a3a]{cursor:pointer;padding-bottom:2px;border-bottom:1px dashed #2f54eb}.secret-cell .add-self-app[data-v-5b395a3a]{width:98px;height:32px;line-height:32px;margin-left:20px;text-align:center;border:1px solid #c0c4cc}.secret-cell .add-self-app[data-v-5b395a3a]:hover{border-color:#2f54eb}.secret-cell .add-self-app:hover span[data-v-5b395a3a]{color:#2f54eb}.add-cell[data-v-5b395a3a]{height:43px;line-height:43px;border-bottom:1px solid #dcdfe6}.add-cell:hover .add-cell-txt[data-v-5b395a3a]{color:#597ef7}.daily-set-wrap[data-v-5b395a3a]{height:100%}.daily-set-wrap .company-set-content[data-v-5b395a3a]{padding:20px}.daily-set-wrap .company-set-content .table-condition-left[data-v-5b395a3a]{font-size:0}.daily-set-wrap .el-form .el-form-item[data-v-5b395a3a]{margin-bottom:4px}.daily-set-wrap .el-form[data-v-5b395a3a] .el-form-item__label{color:#606266}.daily-set-wrap .depart-item-content[data-v-5b395a3a]{width:213px;height:32px;overflow:hidden;white-space:nowrap;border-radius:4px;border:1px solid #dcdfe6;cursor:pointer}.daily-set-wrap .item-cell-select[data-v-5b395a3a] .el-select__tags{white-space:nowrap;overflow:hidden}.daily-set-wrap .depart-cell[data-v-5b395a3a]{position:relative;margin:0 24px 24px 0}.daily-set-wrap .depart-cell .el-icon-circle-close[data-v-5b395a3a]{position:absolute;top:-10px;right:-10px;font-size:16px;color:#808995;cursor:pointer}
\ 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-1c0af3b3.dbc26681.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-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-deba06ea.2cad6e53.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-1c0af3b3.64f40039.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-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-deba06ea.1aab274e.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.84a8efab.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.84a8efab.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-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>
\ 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 17:15:03 * @LastEditTime: 2020-07-28 18:04:49
--> -->
<!-- <!--
授权选择门店绑定弹窗 授权选择门店绑定弹窗
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
const that = this; const that = this;
that.selectGroupData = that.selectMode == 1 ? JSON.parse(JSON.stringify(val)) : []; that.selectGroupData = that.selectMode == 1 ? JSON.parse(JSON.stringify(val)) : [];
that.selectStoreData = that.selectMode == 2 ? JSON.parse(JSON.stringify(val)) : []; that.selectStoreData = that.selectMode == 2 ? JSON.parse(JSON.stringify(val)) : [];
that.selectList = JSON.parse(JSON.stringify(val)) || [];
} }
}, },
methods: { methods: {
...@@ -180,6 +181,7 @@ export default { ...@@ -180,6 +181,7 @@ export default {
that.formData.sendRange = String(that.selectMode); that.formData.sendRange = String(that.selectMode);
that.selectGroupData = that.selectMode == 1 ? JSON.parse(JSON.stringify(that.rangeData)) : []; that.selectGroupData = that.selectMode == 1 ? JSON.parse(JSON.stringify(that.rangeData)) : [];
that.selectStoreData = that.selectMode == 2 ? JSON.parse(JSON.stringify(that.rangeData)) : []; that.selectStoreData = that.selectMode == 2 ? JSON.parse(JSON.stringify(that.rangeData)) : [];
that.formData.selectList = JSON.parse(JSON.stringify(that.rangeData)) || [];
} }
}; };
</script> </script>
......
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 14:33:04 * @LastEditTime: 2020-07-28 18:02:28
--> -->
<!-- <!--
门店绑定-选择分组 门店绑定-选择分组
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</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" :data="groupData" node-key="storeGroupId" lazy show-checkbox default-expand-all :props="defaultProps" :expand-on-click-node="false" @check="checkGroup">
<span 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>
</el-tree> </el-tree>
...@@ -67,9 +67,7 @@ export default { ...@@ -67,9 +67,7 @@ export default {
const that = this; const that = this;
if (val.length) { if (val.length) {
that.$nextTick(()=>{ that.$nextTick(()=>{
val.forEach(ele => { that.$refs.groupTree.setCheckedKeys(val.map(ele=>ele.storeGroupId));
that.$refs.groupTree.setChecked(ele.storeGroupId,true,true);
})
}) })
} }
} }
...@@ -117,18 +115,18 @@ export default { ...@@ -117,18 +115,18 @@ export default {
} }
if(!!e.children) { if(!!e.children) {
// 父级已被绑定，子级要红色显示 // 父级已被绑定，子级要红色显示
// const className = document.getElementById(e.storeGroupId).previousElementSibling.children[0].className; const className = document.getElementById(e.storeGroupId).previousElementSibling.children[0].className;
const parentNode = that.$refs.tree.getNode(e.storeGroupId).parent; const parentNode = !!that.$refs.groupTree.getNode(e.storeGroupId) ? that.$refs.groupTree.getNode(e.storeGroupId).parent : '';
const checkFlag = checkedKeys.checkedKeys.includes(e.storeGroupId); const checkFlag = checkedKeys.checkedKeys.includes(e.storeGroupId);
// 选择并且父级已绑定 // 选择并且父级已绑定
if (checkFlag && parentNode.data.bindFlag == 1) { if (className.includes('is-checked') && !!parentNode &&parentNode.data.bindFlag == 1) {
document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.borderColor = '#f5222d'; document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.borderColor = '#f5222d';
document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.backgroundColor = '#f5222d'; document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.backgroundColor = '#f5222d';
}else { }/* else {
document.getElementById(e.storeGroupId).previousElementSibling.children[0].children[0].style.borderColor = '#ffffff'; 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';
} } */
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);
...@@ -150,6 +148,8 @@ export default { ...@@ -150,6 +148,8 @@ export default {
} }
}) })
that.$emit('checkGroupIds', arr); that.$emit('checkGroupIds', arr);
}else {
that.$emit('checkGroupIds', []);
} }
}, },
treeData(data) { treeData(data) {
...@@ -203,9 +203,7 @@ export default { ...@@ -203,9 +203,7 @@ export default {
that.getGroup(); that.getGroup();
if (that.selectGroup.length) { if (that.selectGroup.length) {
that.$nextTick(()=>{ that.$nextTick(()=>{
that.selectGroup.forEach(ele => { that.$refs.groupTree.setCheckedKeys(that.selectGroup.map(ele=>ele.storeGroupId));
that.$refs.groupTree.setChecked(ele.storeGroupId,true,true);
})
}) })
} }
} }
......
src/components/company/store-auth-store.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 17:09:42 * @LastEditTime: 2020-07-28 17:35:49
--> -->
<!-- <!--
门店绑定-选择门店(限制50个) 门店绑定-选择门店(限制50个)
...@@ -160,7 +160,6 @@ export default { ...@@ -160,7 +160,6 @@ export default {
that.stores = []; that.stores = [];
that.storesCopy = []; that.storesCopy = [];
that.getStoreData(); that.getStoreData();
console.log(that.selectStore)
if (!!that.selectStore.length) { if (!!that.selectStore.length) {
that.dailyRuleForm.stores = that.selectStore.map(el=>el.storeInfoId) || []; that.dailyRuleForm.stores = that.selectStore.map(el=>el.storeInfoId) || [];
}else { }else {
......
src/views/business/new-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-28 17:11:16 * @LastEditTime: 2020-07-28 17:36:08
--> -->
<template> <template>
<div class="my-customer-wrap common-set-wrap"> <div class="my-customer-wrap common-set-wrap">
...@@ -168,7 +168,6 @@ export default { ...@@ -168,7 +168,6 @@ export default {
if (!that.authForm.enterpriseId) { if (!that.authForm.enterpriseId) {
return false return false
} }
console.log(that.authForm.bindRange)
that.selectMode = type == 1 ? that.authForm.bindStoreMode : that.authForm.shareStoreMode; that.selectMode = type == 1 ? that.authForm.bindStoreMode : that.authForm.shareStoreMode;
that.rangeData = type == 1 ? that.authForm.bindRange : that.authForm.shareRange; that.rangeData = type == 1 ? that.authForm.bindRange : that.authForm.shareRange;
that.bindType = type; that.bindType = type;
......
src/views/enterprise/enterprise-set.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-28 16:13:40 * @LastEditTime: 2020-07-28 17:43:37
--> -->
<template> <template>
<div class="daily-set-wrap "> <div class="daily-set-wrap ">
...@@ -43,17 +43,21 @@ ...@@ -43,17 +43,21 @@
</div> </div>
<div> <div>
<div class="self-app-info" v-for="(item, index) in tableData" :key="index+'app'"> <div class="self-app-info" v-for="(item, index) in tableData" :key="index+'app'">
<div class="flex flex-space-between"> <div class="self-app-item secret-name flex flex-space-between">
<div><span>{{ item.secretName || '--'}}</span><span>{{ item.supdateTime | formatTimeStamp}}</span></div> <div><span class="font-14 color-303133">{{ item.secretName || '--'}}</span><span class="font-12 color-606266 p-l-15">{{ item.supdateTime | formatTimeStamp}}</span></div>
<div> <div>
<el-button type="text">编辑</el-button><el-button type="text">删除</el-button> <el-button type="text">编辑</el-button><el-button type="text">删除</el-button>
</div> </div>
</div> </div>
<div><span>Agentld：</span><span>{{item.agentId}}</span></div> <div class="self-app-item"><span>Agentld：</span><span>{{item.agentId}}</span></div>
<div><span>Secret：</span><span>{{item.secretVal}}</span></div> <div class="self-app-item">
<div><span>应用可见范围：</span><span>{{item.displayRange.map(el=>el.name).join(';')}}</span></div> <span>Secret：</span><span>{{item.secretVal}}</span><span class="p-l-15 font-14 color-303133"
><span :class="['iconfont', item.checkFlag ? 'color-49c958 iconchenggong' : 'color-f83431 iconshibai']"></span><span class="p-l-10">{{ item.checkFlag ? '校验成功' : '校验失败' }}</span></span
>
</div>
<div class="self-app-item"><span>应用可见范围：</span><span>{{item.displayRange.map(el=>el.name).join(';')}}</span></div>
</div> </div>
<div v-if="tableData.length" class="add-self-app font-14 color-606266 cursor-pointer" @click="addSecret"><span class="iconfont icontianjiajiahaowubiankuang font-12"></span><span class="p-l-10">添加</span></div> <div v-if="!tableData.length" class="add-self-app font-14 color-606266 cursor-pointer" @click="addSecret"><span class="iconfont icontianjiajiahaowubiankuang font-12"></span><span class="p-l-10">添加</span></div>
</div> </div>
</div> </div>
</div> </div>
...@@ -86,7 +90,14 @@ export default { ...@@ -86,7 +90,14 @@ export default {
location: '' location: ''
}, },
tableData: [], tableData: [{
secretName: '1',
secretVal: '2222',
agentId: 'sdfdff',
checkFlag: 0,
displayRange: [],
updateTime: ''
}],
addShow: false, addShow: false,
editRow: {} editRow: {}
}; };
...@@ -253,6 +264,10 @@ export default { ...@@ -253,6 +264,10 @@ export default {
padding-left: 5px; padding-left: 5px;
} }
.p-l-15 {
padding-left: 15px;
}
.p-l-130 { .p-l-130 {
padding-left: 130px; padding-left: 130px;
} }
...@@ -285,6 +300,16 @@ export default { ...@@ -285,6 +300,16 @@ export default {
padding-bottom: 2px; padding-bottom: 2px;
border-bottom: 1px dashed #2f54eb; border-bottom: 1px dashed #2f54eb;
} }
.self-app-info {
width: 545px;
.self-app-item {
height: 32px;
line-height: 32px;
&.secret-name {
border-bottom: 1px solid #e4e7ed;
}
}
}
.add-self-app { .add-self-app {
width: 98px; width: 98px;
height: 32px; height: 32px;
......
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