Commit 2e133015 by crushh

Merge branch 'feature/12月迭代' into dev

parents b8cf74a2 62ae267c
...@@ -208,6 +208,20 @@ ...@@ -208,6 +208,20 @@
</div> </div>
</div> </div>
</div> </div>
<div class="company-set-content border-box">
<div class="company-title m-b-20 m-t-26 flex flex-space-between flex-align-center">
<p class="color-303133 font-14 font-w-600">授权配置</p>
</div>
<div>
<el-form>
<el-form-item label="开启企微授权">
<el-switch v-model="openFlag" @change="getAgreeExternalFlag" :active-value="1" :inactive-value="0" :disabled="openFlag === 1" />
</el-form-item>
<span class="font-12 color-909399 " style="margin-left: 110px;margin-top:10px;">提示:企微将推送授权给商户的企微管理员,管理员同意授权后,好办才能继续为您提供服务,授权推送流程示例如下:</span>
</el-form>
<img src="../../assets/示例图.png" class="example" alt="示例图" />
</div>
</div>
<secret-set v-if="addShow" :editRow="editRow" @closeText="closeText" @submitText="submitText"></secret-set> <secret-set v-if="addShow" :editRow="editRow" @closeText="closeText" @submitText="submitText"></secret-set>
<add-customize-app v-if="addAppShow" :editRow="addAppRow" :enterpriseId="companyObj.corpid" @closeText="closeAddApp" @submitText="submitAddApp"></add-customize-app> <add-customize-app v-if="addAppShow" :editRow="addAppRow" :enterpriseId="companyObj.corpid" @closeText="closeAddApp" @submitText="submitAddApp"></add-customize-app>
<app-set v-if="getAppShow" :editRow="appEditRow" :type="appSetType" @closeText="closeAppText" @submitText="submitAppText"></app-set> <app-set v-if="getAppShow" :editRow="appEditRow" :type="appSetType" @closeText="closeAppText" @submitText="submitAppText"></app-set>
...@@ -226,6 +240,7 @@ export default { ...@@ -226,6 +240,7 @@ export default {
props: {}, props: {},
data() { data() {
return { return {
openFlag: 0,
checkShow: true, checkShow: true,
tipText: '请在企业密钥维护中输入对应的secret', tipText: '请在企业密钥维护中输入对应的secret',
tableH: window.screen.availHeight - 464 - 126, tableH: window.screen.availHeight - 464 - 126,
...@@ -332,6 +347,14 @@ export default { ...@@ -332,6 +347,14 @@ export default {
}); });
}); });
}, },
getAgreeExternalFlag(val) {
getRequest('/haoban-manage3-web/agree_external_userid_flag', { openFlag: this.openFlag }).then(res => {
let resData = res.data;
if (resData.errorCode == 1) {
showMsg.showmsg('操作成功', 'success');
}
});
},
getRefreshShow() { getRefreshShow() {
const that = this; const that = this;
let para = { let para = {
...@@ -630,6 +653,7 @@ export default { ...@@ -630,6 +653,7 @@ export default {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 1) { if (resData.errorCode == 1) {
that.companyObj = resData.result; that.companyObj = resData.result;
this.openFlag = resData.result.agreeExternalUseridFlag === null ? 0 : resData.result.agreeExternalUseridFlag;
return false; return false;
} }
errMsg.errorMsg(resData); errMsg.errorMsg(resData);
...@@ -706,6 +730,11 @@ export default { ...@@ -706,6 +730,11 @@ export default {
}; };
</script> </script>
<style type="text/scss" lang="scss" scoped> <style type="text/scss" lang="scss" scoped>
.example {
width: 899px;
margin-left: 100px;
margin-top: 20px;
}
.color-c0c4cc { .color-c0c4cc {
display: inline-block; display: inline-block;
line-height: 34px; line-height: 34px;
......
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