diff --git a/src/components/ProjectDetailModal.vue b/src/components/ProjectDetailModal.vue
index d158611..2d48d00 100644
--- a/src/components/ProjectDetailModal.vue
+++ b/src/components/ProjectDetailModal.vue
@@ -217,7 +217,7 @@ const columns = [
{
title: '项目',
align: 'center',
- dataIndex: 'chargeCompanyName'
+ dataIndex: 'projectName'
},
{
title: '邮寄人',
diff --git a/src/views/modules/message/SysMessageTemplateList.vue b/src/views/modules/message/SysMessageTemplateList.vue
index ce011ba..79f614d 100644
--- a/src/views/modules/message/SysMessageTemplateList.vue
+++ b/src/views/modules/message/SysMessageTemplateList.vue
@@ -7,7 +7,6 @@
-
@@ -37,7 +36,7 @@
@@ -72,7 +71,7 @@
编辑
- 删除
+
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index d066776..9f90b17 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -204,7 +204,7 @@ export default {
dataIndex: 'startTime',
width: 160,
customRender: (text, record) => (
- )
+ )
},
{
title: '召开地点',
diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
index f3ccb26..22d6e26 100644
--- a/src/views/projectManagement/InternationalSeminar.vue
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -171,7 +171,7 @@ export default {
align: 'center',
dataIndex: 'startTime',
width: 160,
- customRender: (text, record) => ()
+ customRender: (text, record) => ()
},
{
title: '召开地点',
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
index 59fadc5..a185e9b 100644
--- a/src/views/projectManagement/OtherMeeting.vue
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -168,7 +168,7 @@ name: 'OtherMeeting',
align: 'center',
dataIndex: 'startTime',
width: 160,
- customRender: (text, record) => ()
+ customRender: (text, record) => ()
},
{
title: '召开地点',
diff --git a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
index d22e04d..ec46cb6 100644
--- a/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
+++ b/src/views/projectManagement/modules/WorkGroupDistributeModule.vue
@@ -164,7 +164,12 @@ export default {
this.confirmLoading = false
return
}
- let str = this.checkedKeys.slice(1).join(',').toString()
+ let str = ''
+ if (this.checkedKeys[0] === '0-0') {
+ str = this.checkedKeys.slice(1).join(',').toString()
+ } else {
+ str = this.checkedKeys.join(',').toString()
+ }
this.form.setFieldsValue({ memberName: str })
this.form.validateFields((err) => {
if (!err) {
diff --git a/src/views/system/PermissionList.vue b/src/views/system/PermissionList.vue
index afc6102..d1d715e 100644
--- a/src/views/system/PermissionList.vue
+++ b/src/views/system/PermissionList.vue
@@ -39,28 +39,28 @@
编辑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 更多
+
+
+
+ 详情
+
+
+ 添加下级
+
+
+ 数据规则
+
-
-
-
-
-
-
-
+
+
+
+ 删除
+
+
+
diff --git a/src/views/system/SystemDept.vue b/src/views/system/SystemDept.vue
index c929bb8..5ee9a2b 100644
--- a/src/views/system/SystemDept.vue
+++ b/src/views/system/SystemDept.vue
@@ -51,7 +51,7 @@
- 保存
+ 保存
取消