From 9e7945cde1748e95f8fe08f2b64ce1523a57d3a9 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Thu, 28 Mar 2024 04:41:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=A1=97=E9=81=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E7=BB=9F=E4=B8=80=E6=94=B9=E6=88=90=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/manage/company/companyList.vue | 10 +++++----- src/views/manage/mission/count/index.vue | 8 ++++---- src/views/manage/mission/count/table/detail.vue | 2 +- src/views/manage/mission/count/table/gather.vue | 2 +- src/views/manage/mission/index.vue | 6 +++--- src/views/manage/recruit/count/index.vue | 4 ++-- src/views/manage/recruit/count/table/detail.vue | 2 +- src/views/manage/recruit/count/table/gather.vue | 2 +- src/views/manage/recruit/index.vue | 6 +++--- src/views/manage/works/count/index.vue | 4 ++-- src/views/manage/works/count/table/detail.vue | 2 +- src/views/manage/works/count/table/gather.vue | 2 +- src/views/manage/works/index.vue | 6 +++--- src/views/tenant/main/serve/index.vue | 6 +++--- src/views/tenant/main/talents/index.vue | 2 +- src/views/tenant/mission/Table/WaitingMission.vue | 2 +- src/views/tenant/works/Table/WaitingMission.vue | 2 +- src/views/tenant/works/index.vue | 4 ++-- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue index 12565a6..fafaec2 100644 --- a/src/views/manage/company/companyList.vue +++ b/src/views/manage/company/companyList.vue @@ -208,7 +208,7 @@ export default { addBtn: true, editBtn: true, addBtnText: "社区街道登记", - addTitle: "新增社区街道名称", + addTitle: "新增所属机构", delBtn: false, menuWidth: 300, labelWidth: 151, @@ -217,7 +217,7 @@ export default { dialogFullscreen: true, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", search: true, searchSpan: 6, @@ -489,7 +489,7 @@ export default { // }, { type: "input", - label: "社区街道名称", + label: "所属机构", span: 20, display: true, size: "small", @@ -498,7 +498,7 @@ export default { { required: true, whitespace: true, - message: "请输入社区街道名称", + message: "请输入所属机构", }, ], }, @@ -863,7 +863,7 @@ export default { }); if (!flags) { this.$message.closeAll(); //只显示一个提示 - this.$message.error("该社区街道名称已经审核,不用重复操作"); + this.$message.error("该所属机构已经审核,不用重复操作"); return; } this.$refs.check.open(this.ids[0]); diff --git a/src/views/manage/mission/count/index.vue b/src/views/manage/mission/count/index.vue index ccc3b65..e5bf215 100644 --- a/src/views/manage/mission/count/index.vue +++ b/src/views/manage/mission/count/index.vue @@ -47,8 +47,8 @@ > - - + + @@ -72,8 +72,8 @@ - - + + diff --git a/src/views/manage/mission/count/table/detail.vue b/src/views/manage/mission/count/table/detail.vue index ab1d8c2..21287e6 100644 --- a/src/views/manage/mission/count/table/detail.vue +++ b/src/views/manage/mission/count/table/detail.vue @@ -110,7 +110,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", }, { diff --git a/src/views/manage/mission/count/table/gather.vue b/src/views/manage/mission/count/table/gather.vue index 822ca3b..fafc5a0 100644 --- a/src/views/manage/mission/count/table/gather.vue +++ b/src/views/manage/mission/count/table/gather.vue @@ -76,7 +76,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", }, { diff --git a/src/views/manage/mission/index.vue b/src/views/manage/mission/index.vue index d9ae0ba..f5c77cf 100644 --- a/src/views/manage/mission/index.vue +++ b/src/views/manage/mission/index.vue @@ -8,10 +8,10 @@ :inline="true" > - + @@ -229,7 +229,7 @@ export default { mStatusList: missionState, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", display: false, }, diff --git a/src/views/manage/recruit/count/index.vue b/src/views/manage/recruit/count/index.vue index 8f050c1..27c613a 100644 --- a/src/views/manage/recruit/count/index.vue +++ b/src/views/manage/recruit/count/index.vue @@ -39,8 +39,8 @@ - - + + diff --git a/src/views/manage/recruit/count/table/detail.vue b/src/views/manage/recruit/count/table/detail.vue index b51e069..bb84cff 100644 --- a/src/views/manage/recruit/count/table/detail.vue +++ b/src/views/manage/recruit/count/table/detail.vue @@ -119,7 +119,7 @@ export default { display: false, }, { - label: "社区街道名称", + label: "所属机构", prop: "companyName", }, { diff --git a/src/views/manage/recruit/count/table/gather.vue b/src/views/manage/recruit/count/table/gather.vue index 085c6db..f0cfc49 100644 --- a/src/views/manage/recruit/count/table/gather.vue +++ b/src/views/manage/recruit/count/table/gather.vue @@ -76,7 +76,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", }, { diff --git a/src/views/manage/recruit/index.vue b/src/views/manage/recruit/index.vue index 8f4c359..1b28e42 100644 --- a/src/views/manage/recruit/index.vue +++ b/src/views/manage/recruit/index.vue @@ -8,10 +8,10 @@ :inline="true" > - + @@ -218,7 +218,7 @@ export default { mStatusList: recruitStatus, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", display: false, }, diff --git a/src/views/manage/works/count/index.vue b/src/views/manage/works/count/index.vue index 2c96097..7403289 100644 --- a/src/views/manage/works/count/index.vue +++ b/src/views/manage/works/count/index.vue @@ -39,8 +39,8 @@ - - + + diff --git a/src/views/manage/works/count/table/detail.vue b/src/views/manage/works/count/table/detail.vue index 01237c9..2fcacdd 100644 --- a/src/views/manage/works/count/table/detail.vue +++ b/src/views/manage/works/count/table/detail.vue @@ -119,7 +119,7 @@ export default { display: false, }, { - label: "社区街道名称", + label: "所属机构", prop: "companyName", }, { diff --git a/src/views/manage/works/count/table/gather.vue b/src/views/manage/works/count/table/gather.vue index 18091a0..a563bcf 100644 --- a/src/views/manage/works/count/table/gather.vue +++ b/src/views/manage/works/count/table/gather.vue @@ -76,7 +76,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", }, { diff --git a/src/views/manage/works/index.vue b/src/views/manage/works/index.vue index c5d89aa..be74682 100644 --- a/src/views/manage/works/index.vue +++ b/src/views/manage/works/index.vue @@ -8,10 +8,10 @@ :inline="true" > - + @@ -230,7 +230,7 @@ export default { mStatusList: companyPostState, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", display: false, }, diff --git a/src/views/tenant/main/serve/index.vue b/src/views/tenant/main/serve/index.vue index 622b7f1..f078803 100644 --- a/src/views/tenant/main/serve/index.vue +++ b/src/views/tenant/main/serve/index.vue @@ -39,8 +39,8 @@ - - + + @@ -541,7 +541,7 @@ export default { labelWidth: 120, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", addDisplay: false, }, diff --git a/src/views/tenant/main/talents/index.vue b/src/views/tenant/main/talents/index.vue index 9e0abc9..6678ff8 100644 --- a/src/views/tenant/main/talents/index.vue +++ b/src/views/tenant/main/talents/index.vue @@ -269,7 +269,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", // search: true, // span: 24, diff --git a/src/views/tenant/mission/Table/WaitingMission.vue b/src/views/tenant/mission/Table/WaitingMission.vue index 3acc966..ffac6f1 100644 --- a/src/views/tenant/mission/Table/WaitingMission.vue +++ b/src/views/tenant/mission/Table/WaitingMission.vue @@ -209,7 +209,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", display: false, }, diff --git a/src/views/tenant/works/Table/WaitingMission.vue b/src/views/tenant/works/Table/WaitingMission.vue index b80f68d..b52cf69 100644 --- a/src/views/tenant/works/Table/WaitingMission.vue +++ b/src/views/tenant/works/Table/WaitingMission.vue @@ -216,7 +216,7 @@ export default { dialogClickModal: false, column: [ { - label: "社区街道名称", + label: "所属机构", prop: "companyName", display: false, }, diff --git a/src/views/tenant/works/index.vue b/src/views/tenant/works/index.vue index 449a2f4..3faaf61 100644 --- a/src/views/tenant/works/index.vue +++ b/src/views/tenant/works/index.vue @@ -61,10 +61,10 @@ --> - + From 14fcf0bd87bd6c3ca1fe70bef216a1574cabbdfe Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Thu, 28 Mar 2024 05:48:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E5=88=86=E6=88=90=E4=B8=A4=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant/main/talents/Dialog/addGroups.vue | 146 --- .../main/talents/Dialog/transferGroups.vue | 110 -- src/views/tenant/main/talents/index.vue | 941 ------------------ 3 files changed, 1197 deletions(-) delete mode 100644 src/views/tenant/main/talents/Dialog/addGroups.vue delete mode 100644 src/views/tenant/main/talents/Dialog/transferGroups.vue delete mode 100644 src/views/tenant/main/talents/index.vue diff --git a/src/views/tenant/main/talents/Dialog/addGroups.vue b/src/views/tenant/main/talents/Dialog/addGroups.vue deleted file mode 100644 index 4598053..0000000 --- a/src/views/tenant/main/talents/Dialog/addGroups.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/tenant/main/talents/Dialog/transferGroups.vue b/src/views/tenant/main/talents/Dialog/transferGroups.vue deleted file mode 100644 index 0b60c78..0000000 --- a/src/views/tenant/main/talents/Dialog/transferGroups.vue +++ /dev/null @@ -1,110 +0,0 @@ - - - - - diff --git a/src/views/tenant/main/talents/index.vue b/src/views/tenant/main/talents/index.vue deleted file mode 100644 index 6678ff8..0000000 --- a/src/views/tenant/main/talents/index.vue +++ /dev/null @@ -1,941 +0,0 @@ - - - - - From 32ce3901488c37bae6562d09a507fdf498d59cf5 Mon Sep 17 00:00:00 2001 From: 18500206848 Date: Thu, 28 Mar 2024 05:51:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E5=88=86=E6=88=90=E4=B8=A4=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/talents/certain/Dialog/addGroups.vue | 146 +++ .../talents/certain/Dialog/transferGroups.vue | 110 ++ .../tenant/main/talents/certain/index.vue | 941 ++++++++++++++++++ .../main/talents/latent/Dialog/addGroups.vue | 146 +++ .../talents/latent/Dialog/transferGroups.vue | 110 ++ .../tenant/main/talents/latent/index.vue | 941 ++++++++++++++++++ 6 files changed, 2394 insertions(+) create mode 100644 src/views/tenant/main/talents/certain/Dialog/addGroups.vue create mode 100644 src/views/tenant/main/talents/certain/Dialog/transferGroups.vue create mode 100644 src/views/tenant/main/talents/certain/index.vue create mode 100644 src/views/tenant/main/talents/latent/Dialog/addGroups.vue create mode 100644 src/views/tenant/main/talents/latent/Dialog/transferGroups.vue create mode 100644 src/views/tenant/main/talents/latent/index.vue diff --git a/src/views/tenant/main/talents/certain/Dialog/addGroups.vue b/src/views/tenant/main/talents/certain/Dialog/addGroups.vue new file mode 100644 index 0000000..4598053 --- /dev/null +++ b/src/views/tenant/main/talents/certain/Dialog/addGroups.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue b/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue new file mode 100644 index 0000000..0b60c78 --- /dev/null +++ b/src/views/tenant/main/talents/certain/Dialog/transferGroups.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue new file mode 100644 index 0000000..6678ff8 --- /dev/null +++ b/src/views/tenant/main/talents/certain/index.vue @@ -0,0 +1,941 @@ + + + + + diff --git a/src/views/tenant/main/talents/latent/Dialog/addGroups.vue b/src/views/tenant/main/talents/latent/Dialog/addGroups.vue new file mode 100644 index 0000000..4598053 --- /dev/null +++ b/src/views/tenant/main/talents/latent/Dialog/addGroups.vue @@ -0,0 +1,146 @@ + + + + + \ No newline at end of file diff --git a/src/views/tenant/main/talents/latent/Dialog/transferGroups.vue b/src/views/tenant/main/talents/latent/Dialog/transferGroups.vue new file mode 100644 index 0000000..0b60c78 --- /dev/null +++ b/src/views/tenant/main/talents/latent/Dialog/transferGroups.vue @@ -0,0 +1,110 @@ + + + + + diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue new file mode 100644 index 0000000..6678ff8 --- /dev/null +++ b/src/views/tenant/main/talents/latent/index.vue @@ -0,0 +1,941 @@ + + + + +