Commit e2989c11 authored by 白舜's avatar 白舜 🎱

文案调整: 组织机构 -> 组织,机构 -> 组织

parent c70867ff
<template>
<div class="register-personal-user">
<el-form ref="form" :model="formData" :rules="formDataRules">
<el-form-item label="用户组织机构" prop="oid">
<el-form-item label="用户组织" prop="oid">
<el-select
v-model="formData.oid"
placeholder="搜索并选择"
......@@ -87,7 +87,7 @@
import md5 from "js-md5";
export default {
name: "RegisterOrgUser", // 注册政府机构用户
name: "RegisterOrgUser", // 注册政府组织用户
data() {
const validateUserId = (rule, value, callback) => {
let reg = new RegExp(/^[a-zA-Z0-9|\-|_|\.]+$/);
......@@ -151,7 +151,7 @@
formData: {
is_inside: 1, // 固定1
user_category: 0, // 用户类型0
oid: "", // 用户组织机构 必填
oid: "", // 用户组织 必填
user_id: "", // 用户名 必填
password: "", // 密码 必填
confirm_password: "",
......@@ -164,7 +164,7 @@
},
formDataRules: {
oid: [
{ required: true, message: "请选择用户组织机构", trigger: "change" },
{ required: true, message: "请选择用户组织", trigger: "change" },
],
user_id: [
{ required: true, message: "请输入用户名", trigger: "blur" },
......@@ -302,4 +302,3 @@
}
}
</style>
\ No newline at end of file
......@@ -6,7 +6,7 @@
:rules="formRules"
ref="systemRef"
style="max-width: 66%">
<el-form-item label="所属机构" prop="organization_id">
<el-form-item label="所属组织" prop="organization_id">
<el-tree-select
v-model="systemForm.organization_id"
:data="orgData"
......@@ -225,7 +225,7 @@ const checkPhoneRepet = (rule, value, callback) => {
};
const formRules = reactive({
organization_id: [{ required: true, message: "请选择组织机构", trigger: "change" }],
organization_id: [{ required: true, message: "请选择组织", trigger: "change" }],
business_name: [
{ required: true, message: "请输入业务系统名称", trigger: "blur" },
{ max: 50, message: "业务系统名称最大长度为50个字符", trigger: "blur" },
......
......@@ -46,7 +46,7 @@ import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
const route = useRoute();
const baseInfo = reactive([
{
name: "所属机构",
name: "所属组织",
value: "",
nameWidth: 130,
},
......
......@@ -3,7 +3,7 @@
<bg-breadcrumb></bg-breadcrumb>
<div class="flex_row">
<div class="flex_left bgc_white">
<div class="tree_header">政务机构</div>
<div class="tree_header">政务组织</div>
<div class="tree_content">
<div class="search">
<el-input v-model="filterTree" placeholder="请输入组织名称搜索" :prefix-icon="Search" />
......@@ -207,7 +207,7 @@ const headers = ref([
prop: "system_account",
},
{
label: "所属机构",
label: "所属组织",
prop: "organization_name",
minWidth: 180,
},
......
......@@ -76,7 +76,7 @@ const instanceData = reactive({
approveBasicInfo: [
{
key: "organization_name",
label: "所属机构",
label: "所属组织",
value: "",
// slot: "approvalStatus",
},
......
......@@ -24,7 +24,7 @@ const instanceData = reactive({
approveBasicInfo: [
{
key: "organization_name",
label: "所属机构",
label: "所属组织",
value: "",
// slot: "approvalStatus",
},
......
......@@ -2,7 +2,7 @@
<div class="page_container">
<bg-breadcrumb></bg-breadcrumb>
<div class="main_container">
<bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入业务系统名称、账号或所属机构">
<bg-filter-group @search="changeSearch" v-model="filter.search" placeholder="请输入业务系统名称、账号或所属组织">
<template v-slot:filter_group>
<div class="left-filter filter_list">
<div class="filter_item">
......@@ -133,7 +133,7 @@ const state = reactive({
minWidth: 120,
},
{
label: "所属机构",
label: "所属组织",
prop: "organization_name",
width: 200,
},
......
......@@ -5,7 +5,7 @@
<bg-filter-group
@search="changeSearch"
v-model="filter.search"
placeholder="请输入账号、手机号和所属机构">
placeholder="请输入账号、手机号和所属组织">
<template v-slot:left_action>
<div class="apaas_button">
<el-button type="primary" @click="exportFile">
......@@ -206,7 +206,7 @@ const state = reactive({
// width: 200,
},
{
label: "所属机构",
label: "所属组织",
prop: "name",
// width: 120,
},
......
......@@ -37,7 +37,7 @@ const instanceData = reactive({
},
{
key: "org_name",
label: "所属机构",
label: "所属组织",
value: "",
},
{
......
......@@ -5,7 +5,7 @@
<bg-filter-group
@search="changeSearch"
v-model="filter.search"
placeholder="请输入账号、手机号和所属机构">
placeholder="请输入账号、手机号和所属组织">
<template v-slot:left_action>
<div class="apaas_button">
<el-button type="primary" @click="exportFile">
......
......@@ -3,7 +3,7 @@
<bg-breadcrumb></bg-breadcrumb>
<div class="flex_row">
<div class="flex_left bgc_white">
<div class="tree_header">政务机构</div>
<div class="tree_header">政务组织</div>
<div class="tree_content">
<div class="search">
<el-input v-model="search" placeholder="请输入组织名称搜索" :prefix-icon="Search" @input="searchChange" />
......@@ -282,17 +282,17 @@ const toOrgDetail = () => {
};
const baseInfo = reactive([
{
name: "机构类型",
name: "组织类型",
value: "",
nameWidth: 130,
},
{
name: "组织机构代码",
name: "组织代码",
value: "",
nameWidth: 130,
},
{
name: "机构名称",
name: "组织名称",
value: "",
callback: toOrgDetail,
nameWidth: 130,
......@@ -315,12 +315,12 @@ const baseInfo = reactive([
]);
const baseInfo2 = reactive([
{
name: "机构名称",
name: "组织名称",
value: "",
nameWidth: 130,
},
{
name: "组织机构代码",
name: "组织代码",
value: "",
nameWidth: 130,
},
......
......@@ -60,12 +60,12 @@ const route = useRoute();
const baseInfo = reactive([
{
name: "机构名称",
name: "组织名称",
value: "",
nameWidth: 130,
},
{
name: "组织机构代码",
name: "组织代码",
value: "",
nameWidth: 130,
},
......
......@@ -13,10 +13,10 @@
<el-checkbox v-model="orgForm.level" @change="isTop" label="顶级" />
</el-form-item>
</el-form-item>
<el-form-item label="政务机构名称" prop="name">
<el-form-item label="政务组织名称" prop="name">
<el-input v-model="orgForm.name" />
</el-form-item>
<el-form-item label="组织机构代码" prop="organization_code">
<el-form-item label="组织代码" prop="organization_code">
<el-input v-model="orgForm.organization_code" />
</el-form-item>
<el-form-item label="组织介绍" prop="description">
......@@ -75,13 +75,13 @@ const checkName = (rule, value, callback) => {
const formRules = reactive({
p_organization_id: [{ required: true, message: "输入上级目录", trigger: "blur" }],
name: [
{ required: true, message: "请输入机构名称", trigger: "blur" },
{ max: 50, message: "机构名称最大长度为50位", trigger: "blur" },
{ required: true, message: "请输入组织名称", trigger: "blur" },
{ max: 50, message: "组织名称最大长度为50位", trigger: "blur" },
{ validator: checkName, trigger: "blur" },
],
organization_code: [
{ required: true, message: "请输入组织机构代码", trigger: "blur" },
{ max: 18, message: "组织机构代码最大长度为18位", trigger: "blur" },
{ required: true, message: "请输入组织代码", trigger: "blur" },
{ max: 18, message: "组织代码最大长度为18位", trigger: "blur" },
{ validator: checkCode, trigger: "blur" },
],
});
......
......@@ -6,7 +6,7 @@
:rules="orgAccountFormRules"
ref="orgformAccountRef"
style="max-width: 66%">
<el-form-item label="所属组织机构" prop="organization_id">
<el-form-item label="所属组织" prop="organization_id">
<el-tree-select
v-model="orgAccountForm.organization_id"
:data="orgData"
......
......@@ -19,7 +19,7 @@
<div class="dashed_line"></div>
</div>
<div class="info-form">
<el-form-item prop="organization_id" label="所属机构">
<el-form-item prop="organization_id" label="所属组织">
<el-tree-select
v-model="infoForm.organization_id"
:data="orgData"
......
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