|
@@ -81,6 +81,15 @@
|
|
>
|
|
>
|
|
</el-cascader>
|
|
</el-cascader>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item label="学校" prop="school">
|
|
|
|
+ <el-input
|
|
|
|
+ type="text"
|
|
|
|
+ v-model="registerForm.school"
|
|
|
|
+ placeholder="请输入学校"
|
|
|
|
+ maxlength="100"
|
|
|
|
+ @blur="handleTrim('registerForm', 'school')"
|
|
|
|
+ ></el-input>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item label="备注" prop="desc">
|
|
<el-form-item label="备注" prop="desc">
|
|
<el-input
|
|
<el-input
|
|
type="textarea"
|
|
type="textarea"
|
|
@@ -110,7 +119,7 @@
|
|
>
|
|
>
|
|
</el-option>
|
|
</el-option>
|
|
</el-select>
|
|
</el-select>
|
|
- <p class="tips">输入机构代码或手动选择</p>
|
|
|
|
|
|
+ <p class="tips">输入机构代码或手动选择,个人用户勿选</p>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-divider content-position="left">安全信息</el-divider>
|
|
<el-divider content-position="left">安全信息</el-divider>
|
|
<el-form-item label="手机号" prop="phone">
|
|
<el-form-item label="手机号" prop="phone">
|
|
@@ -193,8 +202,12 @@
|
|
>
|
|
>
|
|
<el-checkbox-group v-model="registerForm.userAgreeCheck">
|
|
<el-checkbox-group v-model="registerForm.userAgreeCheck">
|
|
<el-checkbox label="1" name="userAgreeCheck"
|
|
<el-checkbox label="1" name="userAgreeCheck"
|
|
- ><a @click.prevent="lookUserAgreement"
|
|
|
|
- >阅读并同意《用户协议》</a
|
|
|
|
|
|
+ ><a @click.prevent=""
|
|
|
|
+ >阅读并同意<span
|
|
|
|
+ style="color: #4d78ff; cursor: pointer"
|
|
|
|
+ @click="lookUserAgreement"
|
|
|
|
+ >《用户协议》</span
|
|
|
|
+ ></a
|
|
></el-checkbox
|
|
></el-checkbox
|
|
>
|
|
>
|
|
</el-checkbox-group>
|
|
</el-checkbox-group>
|
|
@@ -213,6 +226,20 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
</div>
|
|
</div>
|
|
|
|
+ <el-dialog
|
|
|
|
+ :visible.sync="showUseragreement"
|
|
|
|
+ width="80%"
|
|
|
|
+ :append-to-body="true"
|
|
|
|
+ :modal="false"
|
|
|
|
+ :show-close="false"
|
|
|
|
+ :close-on-click-modal="false"
|
|
|
|
+ class="login-userAgree"
|
|
|
|
+ >
|
|
|
|
+ <userAgreement
|
|
|
|
+ class="userAgree-login"
|
|
|
|
+ :change-agreement="changeAgreement"
|
|
|
|
+ />
|
|
|
|
+ </el-dialog>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
@@ -225,9 +252,10 @@ import { getLogin } from "@/api/ajax";
|
|
import Cookies from "js-cookie";
|
|
import Cookies from "js-cookie";
|
|
import { mapState } from "vuex";
|
|
import { mapState } from "vuex";
|
|
import { setToken } from "@/utils/auth";
|
|
import { setToken } from "@/utils/auth";
|
|
|
|
+import UserAgreement from "./userAgreement.vue";
|
|
export default {
|
|
export default {
|
|
//import引入的组件需要注入到对象中才能使用
|
|
//import引入的组件需要注入到对象中才能使用
|
|
- components: { Header, Upload },
|
|
|
|
|
|
+ components: { Header, Upload, UserAgreement },
|
|
props: [],
|
|
props: [],
|
|
data() {
|
|
data() {
|
|
//这里存放数据
|
|
//这里存放数据
|
|
@@ -308,6 +336,7 @@ export default {
|
|
sex: 1,
|
|
sex: 1,
|
|
selectedOptions: [],
|
|
selectedOptions: [],
|
|
desc: "",
|
|
desc: "",
|
|
|
|
+ school: "",
|
|
phone: "",
|
|
phone: "",
|
|
email: "",
|
|
email: "",
|
|
newPwd: "", // 密码
|
|
newPwd: "", // 密码
|
|
@@ -353,7 +382,7 @@ export default {
|
|
trigger: "change",
|
|
trigger: "change",
|
|
},
|
|
},
|
|
],
|
|
],
|
|
- region: [{ required: true, message: "请选择机构", trigger: "change" }],
|
|
|
|
|
|
+ // region: [{ required: true, message: "请选择机构", trigger: "change" }],
|
|
email: [{ validator: validateEmail, trigger: "blur" }],
|
|
email: [{ validator: validateEmail, trigger: "blur" }],
|
|
},
|
|
},
|
|
orgList: [], // 筛选之后 机构列表
|
|
orgList: [], // 筛选之后 机构列表
|
|
@@ -364,6 +393,7 @@ export default {
|
|
coverFlag: false,
|
|
coverFlag: false,
|
|
loading: false,
|
|
loading: false,
|
|
show: false,
|
|
show: false,
|
|
|
|
+ showUseragreement: false,
|
|
};
|
|
};
|
|
},
|
|
},
|
|
//计算属性 类似于data概念
|
|
//计算属性 类似于data概念
|
|
@@ -421,6 +451,7 @@ export default {
|
|
phone: form.phone,
|
|
phone: form.phone,
|
|
city_id: form.selectedOptions[1],
|
|
city_id: form.selectedOptions[1],
|
|
memo: form.desc,
|
|
memo: form.desc,
|
|
|
|
+ school: form.school,
|
|
password: form.newPwd,
|
|
password: form.newPwd,
|
|
};
|
|
};
|
|
getLogin(MethodName, data)
|
|
getLogin(MethodName, data)
|
|
@@ -502,6 +533,18 @@ export default {
|
|
handleTrim(form, fild) {
|
|
handleTrim(form, fild) {
|
|
this[form][fild] = this[form][fild].trim();
|
|
this[form][fild] = this[form][fild].trim();
|
|
},
|
|
},
|
|
|
|
+ // 查看用户协议
|
|
|
|
+ lookUserAgreement() {
|
|
|
|
+ this.showUseragreement = true;
|
|
|
|
+ },
|
|
|
|
+ changeAgreement(flag) {
|
|
|
|
+ if (flag) {
|
|
|
|
+ this.registerForm.userAgreeCheck = ["1"];
|
|
|
|
+ } else {
|
|
|
|
+ this.registerForm.userAgreeCheck = [];
|
|
|
|
+ }
|
|
|
|
+ this.showUseragreement = false;
|
|
|
|
+ },
|
|
},
|
|
},
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
async created() {
|
|
async created() {
|
|
@@ -671,5 +714,30 @@ export default {
|
|
.show-icon {
|
|
.show-icon {
|
|
color: #4e5969;
|
|
color: #4e5969;
|
|
}
|
|
}
|
|
|
|
+ .el-checkbox__input.is-checked + .el-checkbox__label {
|
|
|
|
+ color: #165dff;
|
|
|
|
+ }
|
|
|
|
+ .el-checkbox__input.is-checked .el-checkbox__inner,
|
|
|
|
+ .el-checkbox__input.is-indeterminate .el-checkbox__inner {
|
|
|
|
+ background: #165dff;
|
|
|
|
+ border-color: #165dff;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+.login-userAgree {
|
|
|
|
+ .el-dialog {
|
|
|
|
+ height: 70%;
|
|
|
|
+ border-radius: 8px;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .el-dialog__header {
|
|
|
|
+ padding: 0;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .el-dialog__body {
|
|
|
|
+ height: 100%;
|
|
|
|
+ padding: 0;
|
|
|
|
+ border-radius: 8px;
|
|
|
|
+ box-shadow: 0 4px 4px rgba(0, 0, 0, 25%);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
</style>
|
|
</style>
|