diff --git a/src/components/AGR/fun.js b/src/components/AGR/fun.js index a7aca4f9..c6d05e73 100644 --- a/src/components/AGR/fun.js +++ b/src/components/AGR/fun.js @@ -4,7 +4,7 @@ import AGRCOMP from "./index.vue"; const MFAConstructor = Vue.extend(AGRCOMP); let MFAINSTANCELIST = []; const AGR = options => { - const { Id, callBack, cancelBack } = options; + const { Id, IsEn_Us, callBack, cancelBack } = options; if (!Id) throw `Id is requred.but ${Id}` const id = `AGR${new Date().getTime()}`; const instance = new MFAConstructor(); @@ -13,7 +13,7 @@ const AGR = options => { instance.vm = instance.$mount(); if (instance.vm.visible) return; document.body.appendChild(instance.vm.$el); - instance.vm.open({ Id }); + instance.vm.open({ Id, IsEn_Us }); instance.vm.$on("success", (Id) => { if (callBack) callBack(Id) }); diff --git a/src/components/AGR/index.vue b/src/components/AGR/index.vue index 99abf7d2..298520ce 100644 --- a/src/components/AGR/index.vue +++ b/src/components/AGR/index.vue @@ -2,10 +2,11 @@ -
- {{ agreement.FileName }} -
-
+ +
+
- diff --git a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue b/src/views/dictionary/template/agreement/index.vue similarity index 99% rename from src/views/dictionary/attachment/components/AgreementTemplate/index.vue rename to src/views/dictionary/template/agreement/index.vue index 40dd5c66..90c93afb 100644 --- a/src/views/dictionary/attachment/components/AgreementTemplate/index.vue +++ b/src/views/dictionary/template/agreement/index.vue @@ -155,7 +155,7 @@ const searchDataDefault = () => { } } export default { - name: 'AgreementTemplate', + name: 'Agreement', components: { BaseContainer, Pagination, TemplateForm }, data() { return { @@ -196,7 +196,8 @@ export default { }, view(row) { this.$AGR({ - Id: row.Id + Id: row.Id, + IsEn_Us: this.isEN }) }, changeTimeList(key) { diff --git a/src/views/dictionary/template/index.vue b/src/views/dictionary/template/index.vue index 62f19a95..8cec0458 100644 --- a/src/views/dictionary/template/index.vue +++ b/src/views/dictionary/template/index.vue @@ -6,68 +6,45 @@ - + - + - + - + - + - + - + - + - + + + + + @@ -82,6 +59,7 @@ import Email from './email/index.vue' import Sign from './sign/index.vue' import Browser from './browser/index.vue' import File from './file/index.vue' +import Agreement from './agreement/index.vue' export default { name: 'Questions', components: { @@ -95,6 +73,7 @@ export default { MedicalAudit, Browser, File, + Agreement }, data() { return { @@ -122,16 +101,18 @@ export default { display: flex; flex-direction: column; } + .el-tabs__header { height: 40px; margin-bottom: 5px; } + .el-tabs__content { flex: 1; + .el-tab-pane { height: 100%; } } } - diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 16a77aab..2a03c87e 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -297,7 +297,8 @@ export default { let find = this.Agreement.find(item => item.IsCurrentVersion && item.UserAgreementTypeEnum === type) if (!find) return this.$confirm(this.$t('login:message:noAgreement').replace('xxx', this.$fd('UserAgreementType', type))) this.$AGR({ - Id: find.Id + Id: find.Id, + IsEn_Us: this.$i18n.locale !== 'zh' }) }, getAgreementList() { diff --git a/src/views/system/login-log/detail.vue b/src/views/system/login-log/detail.vue index 1c554693..61c664f7 100644 --- a/src/views/system/login-log/detail.vue +++ b/src/views/system/login-log/detail.vue @@ -70,6 +70,7 @@ export default { 'FileVersion', 'UserAgreementId', ], + IsEn_Us: false } }, computed: { @@ -82,6 +83,7 @@ export default { let obj = JSON.parse(this.JsonObj) let curData = [] Object.keys(obj).forEach((key) => { + if (key === 'IsEn_Us') this.IsEn_Us = obj[key] if (this.curKeys.includes(key)) { let o = { key: this.$t(`system:loginLog:form:${key}`), @@ -103,7 +105,8 @@ export default { methods: { view(row) { this.$AGR({ - Id: row.value + Id: row.value, + IsEn_Us: this.IsEn_Us }) }, }