diff --git a/src/components/jero/JUpload.vue b/src/components/jero/JUpload.vue
index ce09f29..1a5ab86 100644
--- a/src/components/jero/JUpload.vue
+++ b/src/components/jero/JUpload.vue
@@ -316,8 +316,8 @@ export default {
file.uploadGoOn = true
const fileSize = file.size // 上传的文件大小
const fileType = file.type // 上传的文件类型
- if (fileSize > 1024 * 1024 * 100) {
- this.$message.warning('文件大小限制为100M')
+ if (fileSize > 1024 * 1024 * 200) {
+ this.$message.warning('文件大小限制为200M')
this.uploadGoOn = false
file.uploadGoOn = false
return false
diff --git a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
index 4ac7161..e92564b 100644
--- a/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
+++ b/src/views/incomePayments/meetManage/AddOrDetailMeet.vue
@@ -176,7 +176,7 @@
-
+
diff --git a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
index 86f39b9..c8bdc03 100644
--- a/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
+++ b/src/views/incomePayments/meetManage/modules/UploadMeetFileModal.vue
@@ -10,7 +10,7 @@
-
新增
@@ -363,8 +363,8 @@ export default {
file.uploadGoOn = true
const fileSize = file.size // 上传的文件大小
const fileType = file.type // 上传的文件类型
- if (fileSize > 1024 * 1024 * 100) {
- this.$message.warning('文件大小限制为100M')
+ if (fileSize > 1024 * 1024 * 200) {
+ this.$message.warning('文件大小限制为200M')
this.uploadGoOn = false
file.uploadGoOn = false
return false
diff --git a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
index b8f56d9..dc81032 100644
--- a/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
+++ b/src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue
@@ -454,8 +454,8 @@ export default {
this.uploadGoOn = true
file.uploadGoOn = true
const fileSize = file.size // 上传的文件大小
- if (fileSize > 1024 * 1024 * 100) {
- this.$message.warning('文件大小限制为100M')
+ if (fileSize > 1024 * 1024 * 200) {
+ this.$message.warning('文件大小限制为200M')
this.uploadGoOn = false
file.uploadGoOn = false
return false
diff --git a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
index f29e536..2d9eb71 100644
--- a/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
+++ b/src/views/incomePayments/memberManage/councilMaintenance/CouncilMaintenanceList.vue
@@ -60,6 +60,7 @@
+ 导入到标协会员
其他分发资料
理事会会议
新增成员
@@ -94,6 +95,8 @@
+
+
@@ -104,10 +107,11 @@ import IconImg from '../../../../assets/imgs/icon/icon_stander_member.png'
import { getAction } from '../../../../api/manage'
import CouncilMaintenanceModal from './modules/CouncilMaintenanceModal'
import CouncilMaintenanceMemberModal from './modules/CouncilMaintenanceMemberModal'
+import ImportMemberModuleModal from './modules/ImportMemberModuleModal'
export default {
name: 'CouncilMaintenanceList',
- components: { PageHeaderTitle, CouncilMaintenanceModal, CouncilMaintenanceMemberModal },
+ components: { PageHeaderTitle, CouncilMaintenanceModal, CouncilMaintenanceMemberModal, ImportMemberModuleModal },
mixins: [JeroListMixin],
data() {
return {
@@ -139,7 +143,7 @@ export default {
title: '操作',
dataIndex: 'operation',
align: 'center',
- width: 420,
+ width: 580,
scopedSlots: { customRender: 'operation' }
}
],
@@ -302,6 +306,13 @@ export default {
})
}
})
+ },
+ /**
+ * 导入到标协会员
+ * @param record
+ */
+ handleImportMemberModule(record) {
+ this.$refs.importMemberModuleModal.add(record)
}
}
}
diff --git a/src/views/incomePayments/memberManage/councilMaintenance/modules/ImportMemberModuleModal.vue b/src/views/incomePayments/memberManage/councilMaintenance/modules/ImportMemberModuleModal.vue
new file mode 100644
index 0000000..c14e2d7
--- /dev/null
+++ b/src/views/incomePayments/memberManage/councilMaintenance/modules/ImportMemberModuleModal.vue
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+
+
+
+ {{ item.projectName }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file