diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 578cabf..a2a15ab 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -5,12 +5,8 @@
-
-
-
-
-
+
+
diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue
index 66dccc2..07d38cf 100644
--- a/src/views/manage/company/companyList.vue
+++ b/src/views/manage/company/companyList.vue
@@ -237,7 +237,7 @@ export default {
addBtn: true,
editBtn: true,
addBtnText: "社区街道登记",
- addTitle: "新增所属机构",
+ addTitle: "新增机构名称",
delBtn: false,
menuWidth: 300,
labelWidth: 151,
@@ -246,7 +246,7 @@ export default {
dialogFullscreen: true,
column: [
{
- label: "所属机构",
+ label: "机构名称",
prop: "companyName",
search: true,
searchSpan: 6,
@@ -273,7 +273,7 @@ export default {
column: [
{
type: "input",
- label: "所属机构",
+ label: "机构名称",
span: 20,
display: true,
size: "small",
@@ -284,7 +284,7 @@ export default {
{
required: true,
whitespace: true,
- message: "请输入所属机构",
+ message: "请输入机构名称",
},
],
},
@@ -382,7 +382,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 e5bf215..321c69b 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 21287e6..2ed796f 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 fafc5a0..c065f06 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 f5c77cf..a873e48 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 27c613a..7a40172 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 bb84cff..bdc217b 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 f0cfc49..9b37fc2 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 1b28e42..f58a77b 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/station/inviteCode.vue b/src/views/manage/station/inviteCode.vue
index e8c5872..dab114f 100644
--- a/src/views/manage/station/inviteCode.vue
+++ b/src/views/manage/station/inviteCode.vue
@@ -110,18 +110,25 @@ const curdOptions = {
index: true,
indexLabel: "序号",
column: [{
- label: '企业名称',
+ label: '机构名称',
prop: 'companyName',
search: true,
- }, {
- label: '用户名',
- prop: 'realName',
- // search: true,
},{
- label: '邀请码',
- prop: 'inviteCode',
+ label: '企业名称',
+ prop: 'comname',
search: true,
},{
+ label: '绑定用户',
+ prop: 'realName',
+ // search: true,
+ },
+ // {
+ // label: '邀请码',
+ // prop: 'inviteCode',
+ // search: true,
+ // },
+
+ {
label: '手机号',
prop: 'phone',
search: true,
@@ -130,10 +137,12 @@ const curdOptions = {
prop: 'idNumber',
search: true,
formatter:(_,value,label) => value
- },{
- label: '备注',
- prop: 'remarks',
- },{
+ },
+ // {
+ // label: '备注',
+ // prop: 'remarks',
+ // },
+ {
label: '启用状态',
prop: 'isEnabled',
slot: true,
diff --git a/src/views/manage/station/mainList.vue b/src/views/manage/station/mainList.vue
index 1dff921..ccad13f 100644
--- a/src/views/manage/station/mainList.vue
+++ b/src/views/manage/station/mainList.vue
@@ -86,6 +86,12 @@ export default {
dialogType: "drawer",
dialogFullscreen: true,
column: [
+ {
+ label: "机构名称",
+ prop: "companyName",
+ search: true,
+ display: false,
+ },
{
label: "公司名称",
prop: "comname",
diff --git a/src/views/manage/works/count/index.vue b/src/views/manage/works/count/index.vue
index 7403289..17392d0 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 2fcacdd..f84c095 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 a563bcf..8f36956 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 be74682..0067a8e 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 d51b513..4be3b1a 100644
--- a/src/views/tenant/main/serve/index.vue
+++ b/src/views/tenant/main/serve/index.vue
@@ -45,8 +45,8 @@
-
-
+
+
@@ -541,7 +541,7 @@ export default {
labelWidth: 120,
column: [
{
- label: "所属机构",
+ label: "机构名称",
prop: "companyName",
addDisplay: false,
},
diff --git a/src/views/tenant/main/talents/certain/index.vue b/src/views/tenant/main/talents/certain/index.vue
index 451e7fa..6705dec 100644
--- a/src/views/tenant/main/talents/certain/index.vue
+++ b/src/views/tenant/main/talents/certain/index.vue
@@ -268,7 +268,7 @@ export default {
dialogClickModal: false,
column: [
{
- label: "所属机构",
+ label: "机构名称",
prop: "companyName",
// search: true,
// span: 24,
diff --git a/src/views/tenant/main/talents/latent/index.vue b/src/views/tenant/main/talents/latent/index.vue
index 5c6295f..171cef5 100644
--- a/src/views/tenant/main/talents/latent/index.vue
+++ b/src/views/tenant/main/talents/latent/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 efabfad..b87dee2 100644
--- a/src/views/tenant/mission/Table/WaitingMission.vue
+++ b/src/views/tenant/mission/Table/WaitingMission.vue
@@ -214,7 +214,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 b52cf69..e6b56fd 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 3faaf61..9786179 100644
--- a/src/views/tenant/works/index.vue
+++ b/src/views/tenant/works/index.vue
@@ -61,10 +61,10 @@
-->
-
+