@@ -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 a52a5d0fcdfd566928efafbbde3ddd2bb4bccd8a..245a7f88177c2cc64e340012917ffabf69c01962 100644
--- a/src/page/main/log/userAccount/index.vue
+++ b/src/page/main/log/userAccount/index.vue
@@ -5,7 +5,7 @@
+ placeholder="请输入账号、手机号和所属组织">
@@ -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 70251da2ab93b5288f0136a5a33876f1d532e947..c2b35dc9c8b6c450425a8841309d64cf3ef7eeeb 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 5b2b6c3c129cbd967e2c9cfe5e1e15f5cd6e8974..b6c58b1c77dfaaa79255f6266f2b00ec05c0aeb0 100644
--- a/src/page/main/log/userBehavior/index.vue
+++ b/src/page/main/log/userBehavior/index.vue
@@ -5,7 +5,7 @@
+ placeholder="请输入账号、手机号和所属组织">
diff --git a/src/page/main/system/organization/index.vue b/src/page/main/system/organization/index.vue
index f3f9a35a2e84baba20dad225c4dd1f84a9f74e71..0201633f793fc246d7238e27145643056d0db9f6 100644
--- a/src/page/main/system/organization/index.vue
+++ b/src/page/main/system/organization/index.vue
@@ -3,7 +3,7 @@
-
@@ -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 cf6c00ec7ed85d1256bf1e37973585eef84626f3..70717d663d0292a48f0d044fcfebb95cfc315425 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 3bf8bf3ed12e373fe57a7164fccd62693f8e81da..2a210383ad7cef582366caa735c01c11d72c3ecb 100644
--- a/src/page/main/system/organization/org-form.vue
+++ b/src/page/main/system/organization/org-form.vue
@@ -13,10 +13,10 @@
-
+
-
+
@@ -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 9a764c084125e18314af05c2dfbf87f111a6b704..a8bb71bcbb485290f5f8decfaa3e852ecf23c121 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%">
-
+
政务机构
+ 政务组织
-
+