From e2989c11ec1954133dee33aca3200ed60d1b3efe Mon Sep 17 00:00:00 2001
From: baishun <baishun@wodcloud.com>
Date: Mon, 8 May 2023 11:19:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=88=E8=B0=83=E6=95=B4=EF=BC=9A?=
 =?UTF-8?q?=20=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=20->=20=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=EF=BC=8C=E6=9C=BA=E6=9E=84=20->=20=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/register-org-user.vue          | 37 +++++++++----------
 .../main/develop/account/add/system-form.vue  |  4 +-
 .../main/develop/account/detail/index.vue     |  2 +-
 src/page/main/develop/account/index.vue       |  4 +-
 .../develop/systemApproval/approval/index.vue |  2 +-
 .../develop/systemApproval/detail/index.vue   |  2 +-
 .../main/develop/systemApproval/index.vue     |  4 +-
 src/page/main/log/userAccount/index.vue       |  4 +-
 .../main/log/userBehavior/detail/index.vue    |  2 +-
 src/page/main/log/userBehavior/index.vue      |  2 +-
 src/page/main/system/organization/index.vue   | 12 +++---
 .../system/organization/org-detail/index.vue  |  4 +-
 .../main/system/organization/org-form.vue     | 12 +++---
 .../org-user/org-account-form.vue             |  2 +-
 src/page/register/index.vue                   |  2 +-
 15 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/src/components/register-org-user.vue b/src/components/register-org-user.vue
index 2147b14..e6c9cd7 100644
--- a/src/components/register-org-user.vue
+++ b/src/components/register-org-user.vue
@@ -1,7 +1,7 @@
 <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="搜索并选择"
@@ -82,12 +82,12 @@
       </el-form>
     </div>
   </template>
-  
+
   <script>
   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|\-|_|\.]+$/);
@@ -115,7 +115,7 @@
       };
       const validatePassword = (rule, value, callback) => {
         let reg = new RegExp(/^(?=.*\d)(?=.*[a-zA-Z])(?=.*[^a-zA-Z0-9]).{8,20}$/);
-  
+
         setTimeout(() => {
           if (value == "") {
             callback(new Error("请输入密码"));
@@ -137,7 +137,7 @@
       };
       const validatePhone = (rule, value, callback) => {
         const reg = /^(?:(?:\+|00)86)?1[3-9]\d{9}$/;
-  
+
         setTimeout(() => {
           if (!reg.test(value)) {
             callback(new Error("请输入正确的手机号码"));
@@ -146,12 +146,12 @@
           }
         });
       };
-  
+
       return {
         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" },
@@ -197,7 +197,7 @@
       getOrgList(queryText) {
         if (queryText) {
           this.laodingOrgList = true;
-  
+
           this.$api.general
             .getOrgList({
               limit: 9999999,
@@ -210,7 +210,7 @@
                 this.$message.error(data.errMsg);
                 this.orgList = [];
               }
-  
+
               this.laodingOrgList = false;
             });
         } else {
@@ -230,11 +230,11 @@
       },
       countDownAction() {
         this.countDown = 60;
-  
+
         if (this.countDownTimer) {
           clearInterval(this.countDownTimer);
         }
-  
+
         this.countDownTimer = setInterval(() => {
           if (this.countDown > 0) {
             this.countDown--;
@@ -250,16 +250,16 @@
               ...this.formData,
               password: md5(this.formData.password),
             };
-  
+
             delete formData.confirm_password;
-  
+
             this.$api.general.registerlUser(formData).then(({ data }) => {
               if (data.success == 1) {
                 this.$message({
                   message: "注册成功",
                   type: "success",
                 });
-  
+
                 this.$emit("success");
               } else {
                 this.$message({
@@ -288,18 +288,17 @@
     },
   };
   </script>
-  
+
   <style lang="less" scoped>
   .msg-code {
     display: flex;
     justify-content: space-between;
     align-items: center;
     margin-top: 25px;
-  
+
     > .bg-identify {
       margin-left: 6px;
       flex-shrink: 0;
     }
   }
   </style>
-  
\ No newline at end of file
diff --git a/src/page/main/develop/account/add/system-form.vue b/src/page/main/develop/account/add/system-form.vue
index 727c3de..aad8079 100644
--- a/src/page/main/develop/account/add/system-form.vue
+++ b/src/page/main/develop/account/add/system-form.vue
@@ -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" },
diff --git a/src/page/main/develop/account/detail/index.vue b/src/page/main/develop/account/detail/index.vue
index 3221d68..6b3c3cc 100644
--- a/src/page/main/develop/account/detail/index.vue
+++ b/src/page/main/develop/account/detail/index.vue
@@ -46,7 +46,7 @@ import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 const route = useRoute();
 const baseInfo = reactive([
   {
-    name: "所属机构",
+    name: "所属组织",
     value: "",
     nameWidth: 130,
   },
diff --git a/src/page/main/develop/account/index.vue b/src/page/main/develop/account/index.vue
index 3b16f21..ea71742 100644
--- a/src/page/main/develop/account/index.vue
+++ b/src/page/main/develop/account/index.vue
@@ -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,
   },
diff --git a/src/page/main/develop/systemApproval/approval/index.vue b/src/page/main/develop/systemApproval/approval/index.vue
index 98d7867..1011773 100644
--- a/src/page/main/develop/systemApproval/approval/index.vue
+++ b/src/page/main/develop/systemApproval/approval/index.vue
@@ -76,7 +76,7 @@ const instanceData = reactive({
   approveBasicInfo: [
     {
       key: "organization_name",
-      label: "所属机构",
+      label: "所属组织",
       value: "",
       // slot: "approvalStatus",
     },
diff --git a/src/page/main/develop/systemApproval/detail/index.vue b/src/page/main/develop/systemApproval/detail/index.vue
index e970a96..d8bfe3e 100644
--- a/src/page/main/develop/systemApproval/detail/index.vue
+++ b/src/page/main/develop/systemApproval/detail/index.vue
@@ -24,7 +24,7 @@ const instanceData = reactive({
   approveBasicInfo: [
     {
       key: "organization_name",
-      label: "所属机构",
+      label: "所属组织",
       value: "",
       // slot: "approvalStatus",
     },
diff --git a/src/page/main/develop/systemApproval/index.vue b/src/page/main/develop/systemApproval/index.vue
index e0e445c..26ba07c 100644
--- a/src/page/main/develop/systemApproval/index.vue
+++ b/src/page/main/develop/systemApproval/index.vue
@@ -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,
     },
diff --git a/src/page/main/log/userAccount/index.vue b/src/page/main/log/userAccount/index.vue
index a52a5d0..245a7f8 100644
--- a/src/page/main/log/userAccount/index.vue
+++ b/src/page/main/log/userAccount/index.vue
@@ -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,
     },
diff --git a/src/page/main/log/userBehavior/detail/index.vue b/src/page/main/log/userBehavior/detail/index.vue
index 70251da..c2b35dc 100644
--- a/src/page/main/log/userBehavior/detail/index.vue
+++ b/src/page/main/log/userBehavior/detail/index.vue
@@ -37,7 +37,7 @@ const instanceData = reactive({
     },
     {
       key: "org_name",
-      label: "所属机构",
+      label: "所属组织",
       value: "",
     },
     {
diff --git a/src/page/main/log/userBehavior/index.vue b/src/page/main/log/userBehavior/index.vue
index 5b2b6c3..b6c58b1 100644
--- a/src/page/main/log/userBehavior/index.vue
+++ b/src/page/main/log/userBehavior/index.vue
@@ -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">
diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue
index f3f9a35..0201633 100644
--- a/src/page/main/system/organization/index.vue
+++ b/src/page/main/system/organization/index.vue
@@ -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,
   },
diff --git a/src/page/main/system/organization/org-detail/index.vue b/src/page/main/system/organization/org-detail/index.vue
index cf6c00e..70717d6 100644
--- a/src/page/main/system/organization/org-detail/index.vue
+++ b/src/page/main/system/organization/org-detail/index.vue
@@ -60,12 +60,12 @@ const route = useRoute();
 
 const baseInfo = reactive([
   {
-    name: "机构名称",
+    name: "组织名称",
     value: "",
     nameWidth: 130,
   },
   {
-    name: "组织机构代码",
+    name: "组织代码",
     value: "",
     nameWidth: 130,
   },
diff --git a/src/page/main/system/organization/org-form.vue b/src/page/main/system/organization/org-form.vue
index 3bf8bf3..2a21038 100644
--- a/src/page/main/system/organization/org-form.vue
+++ b/src/page/main/system/organization/org-form.vue
@@ -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" },
   ],
 });
diff --git a/src/page/main/system/organization/org-user/org-account-form.vue b/src/page/main/system/organization/org-user/org-account-form.vue
index 9a764c0..a8bb71b 100644
--- a/src/page/main/system/organization/org-user/org-account-form.vue
+++ b/src/page/main/system/organization/org-user/org-account-form.vue
@@ -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"
diff --git a/src/page/register/index.vue b/src/page/register/index.vue
index 045c77b..0b77970 100644
--- a/src/page/register/index.vue
+++ b/src/page/register/index.vue
@@ -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"
-- 
2.26.0