diff --git a/src/views/projectManagement/InternationalSeminar.vue b/src/views/projectManagement/InternationalSeminar.vue
new file mode 100644
index 0000000..c33ac78
--- /dev/null
+++ b/src/views/projectManagement/InternationalSeminar.vue
@@ -0,0 +1,308 @@
+<template>
+<div>
+  <page-header-title :img-for-icon="IconImg"></page-header-title>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="会议名称">
+              <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="会议时间">
+              <j-date
+                placeholder="请选择开始日期"
+                class="query-group-cust"
+                v-model="queryParam.meetingStartTime"
+                :disabled-date="disabledStartDate">
+              </j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date
+                placeholder="请选择结束日期"
+                class="query-group-cust"
+                v-model="queryParam.meetingEndTime"
+                :disabled-date="disabledEndDate">
+              </j-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="年份">
+              <j-year-date style="width: 100%" placeholder="请选择年份" v-model="queryParam.particularYear"></j-year-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-form-item label="创建时间">
+              <j-date
+                placeholder="请选择开始日期"
+                class="query-group-cust"
+                v-model="queryParam.createTime_begin"
+                :disabled-date="disabledStartCreateDate">
+              </j-date>
+              <span class="query-group-split-cust"></span>
+              <j-date
+                placeholder="请选择结束日期"
+                class="query-group-cust"
+                v-model="queryParam.createTime_end"
+                :disabled-date="disabledEndCreateDate">
+              </j-date>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('会议管理')">导出</a-button>
+      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        :scroll="{x:true}"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="text" slot-scope="text">
+          <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
+          <span v-else></span>
+        </template>
+
+        <template slot="meetingName" slot-scope="text">
+          <j-ellipsis class="primary-color" v-if="text" :value="text" @click="toAttendance(record)" :length="20"></j-ellipsis>
+          <span v-else></span>
+        </template>
+
+        <span slot="action" slot-scope="text, record" class="action-span-cell">
+          <a @click="handleUploadFile(record)">上传文件</a>
+<!--          <a @click="handleSignup(record)">报名信息</a>-->
+          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleDelete(record.id)">删除</a>
+        </span>
+      </a-table>
+    </div>
+    <!--    <meet-modal ref="modalForm" @ok="modalFormOk"></meet-modal>-->
+    <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
+  </a-card>
+</div>
+</template>
+
+<script>
+import {mixinDevice} from '@/utils/mixin'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {RangeDateMixin} from '@/mixins/RangeDateMixin'
+import JYearDate from '@comp/jero/JYearDate'
+import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import IconImg from '@/assets/imgs/icon/icon_company_management.png'
+import '@/assets/less/TableExpand.less'
+import JDate from '@comp/tools/JDate'
+import moment from 'moment'
+
+export default {
+  name: 'InternationalSeminar',
+  mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
+  components: {
+    JYearDate,
+    UploadMeetFileModal,
+    PageHeaderTitle,
+    JDate
+  },
+  data() {
+    return {
+      description: '国际研讨会',
+      IconImg,
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '会议名称',
+          align: 'center',
+          dataIndex: 'meetingName',
+          scopedSlots: {customRender: 'meetingName'},
+          width: 160,
+        },
+        {
+          title: '会议类型',
+          align: 'center',
+          dataIndex: 'meetingType_dictText',
+          scopedSlots: {customRender: 'text'},
+          width: 100,
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName',
+          scopedSlots: {customRender: 'text'},
+          width: 160,
+        },
+        {
+          title: '召开时间',
+          align: 'center',
+          dataIndex: 'startTime',
+          width: 160,
+          customRender: (text, record) => (<j-ellipsis value={record.startTime  + record.endTime} length={20}></j-ellipsis>)
+        },
+        {
+          title: '召开地点',
+          align: 'center',
+          dataIndex: 'venue',
+          width: 160,
+          customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
+        },
+        {
+          title: '年份',
+          align: 'center',
+          dataIndex: 'particularYear',
+          scopedSlots: {customRender: 'text'},
+          width: 100,
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          scopedSlots: {customRender: 'text'},
+          dataIndex: 'createTime',
+        },
+        {
+          title: '操作',
+          align: 'center',
+          fixed: 'right',
+          width: 160,
+          scopedSlots: {customRender: 'action'}
+        },
+      ],
+      dateKeyObj: {
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndTime'
+      },
+      url: {
+        list: '/meeting/payMeeting/page',
+        delete: '/meeting/payMeeting/delete',
+        deleteBatch: '/meeting/payMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/payMeeting/exportXls',
+        importExcelUrl: 'meeting/payMeeting/importExcel',
+      },
+      disableMixinCreated:true
+    }
+  },
+  created() {
+    this.filters.meetingType = 3
+    this.loadData(1)
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    },
+  },
+  methods: {
+    /*
+    *  上传会议文件
+    * */
+    handleUploadFile(record) {
+      this.$refs.modalForm.edit(record)
+    },
+    /*
+    * 修改查询条件
+    * */
+    searchQuery() {
+      this.queryParam.meetingStartTime = this.queryParam.meetingStartTime ? this.queryParam.meetingStartTime + ' ' + '00:00:00' : undefined
+      this.queryParam.meetingEndTime = this.queryParam.meetingEndTime ? this.queryParam.meetingEndTime + ' ' + '23:59:59' : undefined
+      this.queryParam.createTime_begin = this.queryParam.createTime_begin ? this.queryParam.createTime_begin + ' ' + '00:00:00' : undefined
+      this.queryParam.createTime_end = this.queryParam.createTime_end ? this.queryParam.createTime_end + ' ' + '23:59:59' : undefined
+      this.lastQueryParam = {...this.queryParam}
+      this.loadData(1)
+    },
+    /*
+    *  编辑
+    * /incomePayments/meetManage/AddOrDetailMeet
+    * */
+    handleEdit(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          id: record.id,
+        }
+      })
+    },
+    /*
+    *  新增
+    * */
+    handleAdd() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+      })
+    },
+    /*
+    * 参会情况
+    * */
+    toAttendance(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/Attendance',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName
+        }
+      })
+    },
+    /*
+    * 创建时间开始禁用
+    * */
+    disabledStartCreateDate(startValue) {
+      const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
+      if (!startValue || !endValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+    /*
+    * 创建时间结束禁用
+    * */
+    disabledEndCreateDate(endValue) {
+      const startValue = this.queryParam.createTime_begin && moment(this.queryParam.createTime_begin, this.rangeDateFormat.begin)
+      if (!endValue || !startValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.primary-color {
+  color: #069f99;
+  cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/OtherMeeting.vue b/src/views/projectManagement/OtherMeeting.vue
new file mode 100644
index 0000000..f98ec4a
--- /dev/null
+++ b/src/views/projectManagement/OtherMeeting.vue
@@ -0,0 +1,314 @@
+<template>
+  <div>
+    <page-header-title :img-for-icon="IconImg"></page-header-title>
+    <a-card :bordered="false">
+      <!-- 查询区域 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="会议名称">
+                <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="会议时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingStartTime"
+                  :disabled-date="disabledStartDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingEndTime"
+                  :disabled-date="disabledEndDate">
+                </j-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="年份">
+                <j-year-date style="width: 100%" placeholder="请选择年份" v-model="queryParam.particularYear"></j-year-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+              <a-form-item label="创建时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.createTime_begin"
+                  :disabled-date="disabledStartCreateDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.createTime_end"
+                  :disabled-date="disabledEndCreateDate">
+                </j-date>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button @click="searchReset" icon="reload" class="reset-button" style="margin-left: 8px">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 查询区域-END -->
+
+      <!-- 操作按钮区域 -->
+      <div class="table-operator">
+        <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+        <a-button type="primary" icon="download" @click="handleExportXls('会议管理')">导出</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+      </div>
+
+      <!-- table区域-begin -->
+      <div>
+
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :scroll="{x:true}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          class="j-table-force-nowrap"
+          @change="handleTableChange">
+
+          <template slot="htmlSlot" slot-scope="text,record">
+            <div class="primary-color" @click="toAttendance(record)">{{ text }}</div>
+          </template>
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
+            <span v-else></span>
+          </template>
+          <span slot="action" slot-scope="text, record" class="action-span-cell">
+          <a @click="handleUploadFile(record)">上传文件</a>
+<!--          <a @click="handleSignup(record)">报名信息</a>-->
+          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleDelete(record.id)">删除</a>
+        </span>
+        </a-table>
+      </div>
+      <!--    <meet-modal ref="modalForm" @ok="modalFormOk"></meet-modal>-->
+      <upload-meet-file-modal ref="modalForm" @ok="modalFormOk"></upload-meet-file-modal>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import {mixinDevice} from '@/utils/mixin'
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import {RangeDateMixin} from '@/mixins/RangeDateMixin'
+import JYearDate from '@comp/jero/JYearDate'
+import UploadMeetFileModal from '@views/incomePayments/meetManage/modules/UploadMeetFileModal'
+import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
+import IconImg from '@/assets/imgs/icon/icon_company_management.png'
+import '@/assets/less/TableExpand.less'
+import JDate from '@comp/tools/JDate'
+import moment from 'moment'
+export default {
+name: 'OtherMeeting',
+  mixins: [JeroListMixin, mixinDevice, RangeDateMixin],
+  components: {
+    JYearDate,
+    UploadMeetFileModal,
+    PageHeaderTitle,
+    JDate
+  },
+  data() {
+    return {
+      description: '国际研讨会',
+      IconImg,
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '会议名称',
+          align: 'center',
+          dataIndex: 'meetingName',
+          scopedSlots: {customRender: 'htmlSlot'},
+          width: 160,
+        },
+        {
+          title: '会议类型',
+          align: 'center',
+          dataIndex: 'meetingType_dictText',
+          width: 100,
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName',
+          width: 160,
+          scopedSlots: {customRender: 'text'},
+        },
+        {
+          title: '召开时间',
+          align: 'center',
+          dataIndex: 'startTime',
+          width: 160,
+          customRender: (text, record) => (<j-ellipsis value={record.startTime  + record.endTime} length={20}></j-ellipsis>)
+        },
+        {
+          title: '召开地点',
+          align: 'center',
+          dataIndex: 'venue',
+          width: 160,
+          customRender: (text, record) => (<j-ellipsis value={text + '/' + record.address} length={20}></j-ellipsis>)
+        },
+        {
+          title: '年份',
+          align: 'center',
+          dataIndex: 'particularYear',
+          width: 100,
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '操作',
+          align: 'center',
+          fixed: 'right',
+          width: 160,
+          scopedSlots: {customRender: 'action'}
+        },
+      ],
+      dateKeyObj: {
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndTime'
+      },
+      url: {
+        list: '/meeting/payMeeting/page',
+        delete: '/meeting/payMeeting/delete',
+        deleteBatch: '/meeting/payMeeting/deleteBatch',
+        exportXlsUrl: '/meeting/payMeeting/exportXls',
+        importExcelUrl: 'meeting/payMeeting/importExcel',
+      },
+      disableMixinCreated:true
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    },
+  },
+  created() {
+    this.filters.meetingType = 4
+    this.loadData(1)
+  },
+  methods: {
+    /*
+    *  上传会议文件
+    * */
+    handleUploadFile(record) {
+      this.$refs.modalForm.edit(record)
+    },
+    /*
+    *  报名信息
+    * */
+    handleSignup() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/SignUpInfoList'
+      })
+    },
+    /*
+    * 修改查询条件
+    * */
+    searchQuery() {
+      this.queryParam.meetingStartTime = this.queryParam.meetingStartTime ? this.queryParam.meetingStartTime + ' ' + '00:00:00' : undefined
+      this.queryParam.meetingEndTime = this.queryParam.meetingEndTime ? this.queryParam.meetingEndTime + ' ' + '23:59:59' : undefined
+      this.queryParam.createTime_begin = this.queryParam.createTime_begin ? this.queryParam.createTime_begin + ' ' + '00:00:00' : undefined
+      this.queryParam.createTime_end = this.queryParam.createTime_end ? this.queryParam.createTime_end + ' ' + '23:59:59' : undefined
+      this.lastQueryParam = {...this.queryParam}
+      this.loadData(1)
+    },
+    /*
+    *  编辑
+    * /incomePayments/meetManage/AddOrDetailMeet
+    * */
+    handleEdit(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+        query: {
+          id: record.id,
+        }
+      })
+    },
+    /*
+    *  新增
+    * */
+    handleAdd() {
+      this.$router.push({
+        path: '/incomePayments/meetManage/AddOrDetailMeet',
+      })
+    },
+    /*
+    * 参会情况
+    * */
+    toAttendance(record) {
+      this.$router.push({
+        path: '/incomePayments/meetManage/Attendance',
+        query: {
+          id: record.id,
+          meetingName: record.meetingName
+        }
+      })
+    },
+    /*
+    * 创建时间开始禁用
+    * */
+    disabledStartCreateDate(startValue) {
+      const endValue = this.queryParam.createTime_end && moment(this.queryParam.createTime_end, this.rangeDateFormat.end)
+      if (!startValue || !endValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+    /*
+    * 创建时间结束禁用
+    * */
+    disabledEndCreateDate(endValue) {
+      const startValue = this.queryParam.createTime_begin && moment(this.queryParam.createTime_begin, this.rangeDateFormat.begin)
+      if (!endValue || !startValue) {
+        return false
+      }
+      return startValue.valueOf() > endValue.valueOf()
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.primary-color {
+  color: #069f99;
+  cursor: pointer;
+}
+
+</style>
\ No newline at end of file