From 9dc24b2b8bd4f1f6b8bce0fd642c9378b5a4cfeb Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Mon, 30 Aug 2021 18:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=EF=BC=9B=E5=88=86=E6=A0=87=E5=A7=94?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9B=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=BC=9A=E8=AE=AE=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CommitteeMaintenance.vue                  |  13 -
 .../committee/CommitteeMaintenance.vue        | 252 ++++++++++++++++++
 .../modules/CommitteeMemberModule.vue         | 207 ++++++++++++++
 .../committee/modules/CommitteeModule.vue     | 131 +++++++++
 .../memberManage/MemberProjectList.vue        |   2 +-
 .../ConferenceMaintenance.vue                 | 114 ++++++--
 .../GeneralProjectManagement.vue              |  48 ++--
 .../MemberUnitMaintenance.vue                 |   6 +-
 .../WorkingGroupProjectManagement.vue         |  67 ++++-
 .../modules/GeneralProjectModule.vue          |  81 ++++--
 .../modules/WorkingGroupProjectModule.vue     |  19 +-
 11 files changed, 837 insertions(+), 103 deletions(-)
 delete mode 100644 src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue
 create mode 100644 src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
 create mode 100644 src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
 create mode 100644 src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue

diff --git a/src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue
deleted file mode 100644
index 2415db0..0000000
--- a/src/views/dataNetworkDiskManagement/CommitteeMaintenance.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-
-</template>
-
-<script>
-export default {
-  name: 'CommitteeMaintenance'
-}
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
new file mode 100644
index 0000000..8e6adc0
--- /dev/null
+++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue
@@ -0,0 +1,252 @@
+<template>
+  <a-card :bordered="false">
+    <!--    查询区域-start -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select placeholder="请选择分标委名称"
+                        show-search
+                        option-filter-prop="children"
+                        v-model="queryParam.name"
+                        :filter-option="filterOption">
+                <a-select-option v-for="item in dataSource" :key="item.id" :value="item.name">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入企业名称" v-model="queryParam.companyName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入用户名称" v-model="queryParam.contactsName"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery">查询</a-button>
+              <a-button icon="reload" @click="searchReset">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!--    查询区域-end-->
+
+    <!--    操作按钮区域-->
+    <div class="table-operator">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
+      <a-button type="primary" icon="export" @click="handleExportXls('分标委维护')">导出</a-button>
+      <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+    </div>
+    <!--    操作按钮区域-end-->
+
+    <!--    table表格区域-->
+    <div>
+      <a-table rowKey="id"
+               :scroll="{x: 1300}"
+               :columns="columns"
+               :data-source="dataSource"
+               :pagination="ipagination"
+               bordered
+               :loading="loading"
+               class="j-table-force-nowrap">
+        <template slot="text" slot-scope="text,record">
+          <j-ellipsis :value="text" :length="20"></j-ellipsis>
+        </template>
+
+        <span slot="operation" class="action-span-cell" slot-scope="text, record">
+          <a @click="handleAddCommitteeMember(record)">新增委员</a>
+          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleDelete(record.id)">删除</a>
+        </span>
+
+        <a-table
+            rowKey="id"
+            slot="expandedRowRender"
+            slot-scope="text, record"
+            :columns="committeeMemberColumns"
+            :data-source="record.committeeMember"
+            :pagination="false"
+            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+            @change="handleTableChange"
+            class="j-table-force-nowrap">
+          <template slot="textRow" slot-scope="text,record">
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          </template>
+
+          <span slot="action" class="action-span-cell" slot-scope="text, record">
+            <a @click="handleEdit(record)">编辑</a>
+            <a @click="handleDelete(record.id)">删除</a>
+          </span>
+        </a-table>
+      </a-table>
+    </div>
+    <!--    /table表格区域-->
+
+    <!--    新增分标委-->
+    <committee-module ref="modalForm" @ok="modalFormOk"></committee-module>
+
+    <committee-member-module ref="memberModalForm" @ok="modalFormOk"></committee-member-module>
+  </a-card>
+</template>
+
+<script>
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import CommitteeModule from '@views/dataNetworkDiskManagement/committee/modules/CommitteeModule'
+import CommitteeMemberModule from '@views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule'
+import { getAction } from '@api/manage'
+
+export default {
+  name: 'CommitteeMaintenance',
+  components: { CommitteeModule, CommitteeMemberModule },
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      url: {
+        list: '/payCaseCommittee/payCaseCommittee/list',
+        committeeMemberList: '/payCaseCommitteeSubitem/payCaseCommitteeSubitem/list',
+        delete: '',
+        deleteBatch: '',
+        exportXlsUrl: ''
+      },
+      // 父级表头
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 80,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '分标委名称',
+          align: 'center',
+          dataIndex: 'name',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '操作',
+          dataIndex: 'operation',
+          align: 'center',
+          width: 200,
+          scopedSlots: { customRender: 'operation' }
+        }
+      ],
+      // 委员表头
+      committeeMemberColumns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 80,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '姓名',
+          align: 'center',
+          dataIndex: 'contactsName',
+          scopedSlots: { customRender: 'textRow' }
+        }, {
+          title: '企业名称',
+          align: 'center',
+          dataIndex: 'companyName',
+          scopedSlots: { customRender: 'textRow' }
+        }, {
+          title: '职务',
+          align: 'center',
+          dataIndex: '',
+          scopedSlots: { customRender: 'textRow' }
+        }, {
+          title: '手机号',
+          align: 'center',
+          dataIndex: '',
+          scopedSlots: { customRender: 'textRow' }
+        }, {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          width: 199,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      dataSource: []
+    }
+  },
+  methods: {
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("请设置url.list属性!")
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      let params = this.getQueryParams();//查询条件
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          this.dataSource = res.result.records
+          if (this.dataSource.length > 0) {
+            this.dataSource.forEach(item => {
+              const param = {
+                committeeId: item.id
+              }
+              getAction(this.url.committeeMemberList, param).then(tt =>{
+                item.committeeMember = tt.result.records
+              })
+            })
+          }
+          if (res.result.total) {
+            this.ipagination.total = res.result.total;
+            //清空列表选中
+            this.onClearSelected()
+          } else {
+            this.ipagination.total = 0;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    handleAddCommitteeMember(record) {
+      console.log(record)
+      record.committeeId = record.id
+      this.$refs.memberModalForm.add(record);
+      this.$refs.memberModalForm.title = "新增成员";
+      this.$refs.memberModalForm.disableSubmit = false;
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
new file mode 100644
index 0000000..9133e01
--- /dev/null
+++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue
@@ -0,0 +1,207 @@
+<template>
+  <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      switchFullscreen
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入分标委名称"
+                       v-decorator="['name',validatorRules.name]"
+                       :disabled="true"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <company-select placeholder="请选择企业"
+                              v-decorator="['company',validatorRules.company]"
+                              @change="companyChange">
+              </company-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <select-contacts :selected-company="selectedCompany"
+                               placeholder="请选择联系人"
+                               v-decorator="['contactsId',validatorRules.contactsId]"
+                               :maxLength='50'
+                               ref="selectContacts"
+                               @change="handleContactChange"
+                               @ok="addContactsOk"></select-contacts>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入职务"
+                       v-decorator="['post',validatorRules.post]"
+                       :disabled="true"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="手机" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入手机"
+                       v-decorator="['phone',validatorRules.phone]"
+                       :disabled="true"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入邮箱"
+                       v-decorator="['email',validatorRules.email]"
+                       :disabled="true"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { httpAction } from '@api/manage'
+import { getContactsById } from '@api/api'
+import CompanySelect from '@comp/company/CompanySelect'
+import SelectContacts from '@comp/company/SelectContacts'
+
+export default {
+  name: 'CommitteeMemberModule',
+  components: { CompanySelect, SelectContacts },
+  data() {
+    return {
+      title: '操作',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      selectedCompany: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      },
+      validatorRules: {
+        company: {
+          rules: [{ required: true, message: '请选择企业' }],
+          validateTrigger: 'blur'
+        },
+        contactsId: {
+          rules: [{ required: true, message: '请选择联系人' }],
+          validateTrigger: 'blur'
+        }
+      }
+    }
+  },
+  methods: {
+    add(record) {
+      this.edit(record)
+    },
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      console.log(this.model, '=========')
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'name'))
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.dataSource = this.dataForm
+          values.signingUp = this.applyAdd
+          let httpurl = ''
+          let method = 'post'
+          if (!this.model.id) {
+            httpurl += this.url.add
+          } else {
+            httpurl += this.url.edit
+          }
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          httpAction(httpurl, formData, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    /**
+     * 选中企业变化，将联系人的值清空
+     * @param value
+     */
+    companyChange(value) {
+      console.log(value)
+      this.selectedCompany = value
+      this.model.contactsId = undefined
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId'))
+      })
+    },
+    /**
+     * 在新增成功后重新获取联系人列表
+     */
+    addContactsOk() {
+      this.$refs.selectContacts.getContactsList()
+    },
+    /**
+     * 获取选中联系人的信息并回显
+     * @param value
+     */
+    handleContactChange(value) {
+      const param = {
+        id: value
+      }
+      getContactsById(param).then(res => {
+        this.model = Object.assign(this.model, res.result)
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'email', 'phone', 'post'))
+        })
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
new file mode 100644
index 0000000..02b19ca
--- /dev/null
+++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue
@@ -0,0 +1,131 @@
+<template>
+  <j-modal
+      :title="title"
+      :width="width"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      switchFullscreen
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-row>
+          <a-col>
+            <a-form-item label="分标委名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入分标委名称"
+                       v-decorator="['name',validatorRules.name]"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col>
+            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-textarea
+                  placeholder="请输入备注"
+                  v-decorator="['remarks']"
+                  :auto-size="{ minRows: 3, maxRows: 6 }"
+                  :maxLength='200'
+                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { httpAction } from '@api/manage'
+
+export default {
+  name: 'CommitteeModule',
+  data() {
+    return {
+      title: '操作',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 3 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 21 }
+      },
+      validatorRules: {
+        name: {
+          rules: [{ required: true, message: '请输入分标委名称' }],
+          validateTrigger: 'blur'
+        }
+      }
+    }
+  },
+  methods: {
+    add() {
+      this.edit({})
+    },
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, ))
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.dataSource = this.dataForm
+          values.signingUp = this.applyAdd
+          let httpurl = ''
+          let method = 'post'
+          if (!this.model.id) {
+            httpurl += this.url.add
+          } else {
+            httpurl += this.url.edit
+          }
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          httpAction(httpurl, formData, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+          option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/incomePayments/memberManage/MemberProjectList.vue b/src/views/incomePayments/memberManage/MemberProjectList.vue
index 23fb19b..e5ca7ac 100644
--- a/src/views/incomePayments/memberManage/MemberProjectList.vue
+++ b/src/views/incomePayments/memberManage/MemberProjectList.vue
@@ -11,7 +11,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="运行年份">
-              <j-year-date  placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>
+              <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.particularYear"></j-year-date>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
diff --git a/src/views/projectManagement/ConferenceMaintenance.vue b/src/views/projectManagement/ConferenceMaintenance.vue
index fe9c42c..83f4313 100644
--- a/src/views/projectManagement/ConferenceMaintenance.vue
+++ b/src/views/projectManagement/ConferenceMaintenance.vue
@@ -37,7 +37,8 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date show-type="year" date-format="YYYY" placeholder="请选择年份" v-model="queryParam.year"></j-date>
+              <j-year-date style="width:100%" placeholder="请选择年份"
+                           v-model="queryParam.year"></j-year-date>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -65,25 +66,55 @@
     <!--    操作按钮区域-->
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-                @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
       <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
-      <a-button type="primary" icon="download" @click="downTemplate('企业管理导入模板')">下载模板</a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+      <a-button type="primary" @click="">发布-提醒</a-button>
     </div>
     <!--    /操作按钮区域-end-->
+
+    <!--    table表格区域-->
+    <div>
+      <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :scroll="{x: 1500}"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+        <!--        工作组名称-->
+        <template slot="projectName" slot-scope="text, record">
+          <div class="project-name" @click="goMemberUnitMaintenance(record)">{{ text }}</div>
+        </template>
+
+        <template slot="text" slot-scope="text,record">
+          <j-ellipsis :value="text" :length="20"></j-ellipsis>
+        </template>
+
+        <span slot="action" class="action-span-cell" slot-scope="text, record">
+          <a @click="">上传文件</a>
+          <a @click="">报名信息</a>
+          <a @click="handleEdit(record)">编辑</a>
+          <a @click="handleDelete(record.id)">删除</a>
+        </span>
+      </a-table>
+    </div>
   </a-card>
 </template>
 
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import JDate from '@comp/jero/JDate'
+import JYearDate from '@comp/jero/JYearDate'
 
 export default {
   name: 'ConferenceMaintenance',
-  components: { JDate },
+  components: { JYearDate },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -98,26 +129,75 @@ export default {
         xs: { span: 24 },
         sm: { span: 10 }
       },
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '会议名称',
+          align: 'center',
+          dataIndex: '',
+          scopedSlots: { customRender: 'projectName' }
+        }, {
+          title: '会议类型',
+          align: 'center',
+          width: 140,
+          dataIndex: ''
+        }, {
+          title: '负责人',
+          align: 'center',
+          dataIndex: '',
+        }, {
+          title: '召开时间',
+          align: 'center',
+          dataIndex: '',
+          width: 180,
+        }, {
+          title: '年份',
+          align: 'center',
+          dataIndex: '',
+          width: 120,
+        }, {
+          title: '已提醒',
+          align: 'center',
+          width: 80,
+          dataIndex: ''
+        }, {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: '',
+          width: 180,
+        }, {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 180,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
       url: {
         list: '',
         delete: '',
         deleteBatch: '',
-        exportXlsUrl: '',
-        importExcelUrl: '',
-        downTemplateUrl: ''
-      },
+        exportXlsUrl: ''
+      }
     }
   },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    },
-  },
   created() {
     this.workingGroupProject = this.$route.query.workingGroupProject
     this.workingGroupProjectId = this.$route.query.workingGroupProjectId
   },
   methods: {
+    /**
+     * 返回工作组项目列表
+     */
     backWorkingGroupProject() {
       this.$router.push({
         path: '/projectManagement/WorkingGroupProjectManagement'
diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue
index c61cbc2..41150c6 100644
--- a/src/views/projectManagement/GeneralProjectManagement.vue
+++ b/src/views/projectManagement/GeneralProjectManagement.vue
@@ -31,12 +31,12 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date show-type="year" date-format="YYYY" placeholder="请选择来款年份" v-model="queryParam.paymentDate"></j-date>
+              <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.paymentDate"></j-year-date>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date show-type="year" date-format="YYYY" placeholder="请选择运行年份" v-model="queryParam.year"></j-date>
+              <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -72,22 +72,9 @@
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange"
           class="j-table-force-nowrap">
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt=""
-               style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <j-ellipsis @click.native="uploadFile(record.chargeNoticeFileId)" style="color:#219AFF;cursor: pointer"
-                      :value="text" :length="20"/>
-        </template>
 
         <template slot="text" slot-scope="text,record">
-          <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          <j-ellipsis :value="text" :length="18"></j-ellipsis>
         </template>
 
         <!--        打包、需要发票、到账、开票、邮寄状态-->
@@ -108,13 +95,13 @@
 
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import JDate from '@comp/jero/JDate'
+import JYearDate from '@comp/jero/JYearDate'
 import GeneralProjectModule from './modules/GeneralProjectModule'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 
 export default {
   name: 'GeneralProjectManagement',
-  components: { JDate, GeneralProjectModule, SelectPrincipal },
+  components: { JYearDate, GeneralProjectModule, SelectPrincipal },
   mixins: [JeroListMixin],
   computed: {
     importExcelUrl: function(){
@@ -144,7 +131,7 @@ export default {
         }, {
           title: '来款项目',
           align: 'center',
-          width: 180,
+          width: 200,
           dataIndex: 'chargeProject',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -156,7 +143,7 @@ export default {
         }, {
           title: '来款单位',
           align: 'center',
-          width: 180,
+          width: 200,
           dataIndex: 'chargeCompanyName',
           scopedSlots: { customRender: 'text' }
         }, {
@@ -184,28 +171,28 @@ export default {
         }, {
           title: '打包',
           align: 'center',
-          width: 100,
+          width: 80,
           dataIndex: 'packaging'
         }, {
           title: '需要发票',
           align: 'center',
-          width: 100,
+          width: 80,
           dataIndex: 'invoice',
-          scopedSlots: { customRender: 'icon' }
+          // scopedSlots: { customRender: 'icon' }
         }, {
           title: '到账',
           align: 'center',
-          width: 100,
+          width: 80,
           dataIndex: 'inAccount'
         }, {
           title: '开票',
           align: 'center',
-          width: 100,
+          width: 80,
           dataIndex: 'makeInvoice'
         }, {
           title: '邮寄',
           align: 'center',
-          width: 100,
+          width: 80,
           dataIndex: 'mail'
         }, {
           title: '操作',
@@ -217,12 +204,9 @@ export default {
         }
       ],
       url: {
-        list: '',
-        delete: '',
-        deleteBatch: '',
-        exportXlsUrl: '',
-        importExcelUrl: '',
-        exportTemplateUrl: ''
+        list: '/project/payCommonProject/list',
+        delete: '/project/payCommonProject/delete',
+        deleteBatch: '/project/payCommonProject/deleteBatch'
       }
     }
   }
diff --git a/src/views/projectManagement/MemberUnitMaintenance.vue b/src/views/projectManagement/MemberUnitMaintenance.vue
index 3c8e1b5..e75cb3d 100644
--- a/src/views/projectManagement/MemberUnitMaintenance.vue
+++ b/src/views/projectManagement/MemberUnitMaintenance.vue
@@ -37,7 +37,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date show-type="year" date-format="YYYY" placeholder="请选择年份" v-model="queryParam.year"></j-date>
+              <j-year-date style="width:100%" placeholder="请选择年份" v-model="queryParam.year"></j-year-date>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -102,11 +102,11 @@
 
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import JDate from '@comp/jero/JDate'
+import JYearDate from '@comp/jero/JYearDate'
 
 export default {
   name: 'MemberUnitMaintenance',
-  components: { JDate },
+  components: { JYearDate },
   mixins: [JeroListMixin],
   computed: {
     importExcelUrl: function () {
diff --git a/src/views/projectManagement/WorkingGroupProjectManagement.vue b/src/views/projectManagement/WorkingGroupProjectManagement.vue
index 4f96baa..72e4f08 100644
--- a/src/views/projectManagement/WorkingGroupProjectManagement.vue
+++ b/src/views/projectManagement/WorkingGroupProjectManagement.vue
@@ -16,7 +16,7 @@
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-date show-type="year" date-format="YYYY" placeholder="请选择运行年份" v-model="queryParam.year"></j-date>
+              <j-year-date style="width:100%" placeholder="请选择运行年份" v-model="queryParam.year"></j-year-date>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -28,20 +28,34 @@
         </a-row>
       </a-form>
     </div>
-    <!--    查询区域-end-->
+    <!--    /查询区域-end-->
 
     <!--    操作按钮区域-->
     <div class="table-operator">
       <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+
+      <!--      进度条tooltip-->
+      <div class="tooltip">
+        <div class="tooltip-item">
+          <div class="tooltip-color tooltip-pay-in-full"></div>
+          <span>已付全款</span>
+        </div>
+        <div class="tooltip-item">
+          <div class="tooltip-color tooltip-partial-payment"></div>
+          <span>部分付款</span>
+        </div>
+        <div class="tooltip-item">
+          <div class="tooltip-color tooltip-non-payment"></div>
+          <span>未付款</span>
+        </div>
+      </div>
+      <!--      /进度条tooltip-->
     </div>
-    <!--    操作按钮区域-end-->
+    <!--    /操作按钮区域-end-->
 
     <!--    table表格区域-->
     <div>
-      <div class="">
-
-      </div>
       <a-table
           ref="table"
           size="middle"
@@ -77,20 +91,21 @@
         </span>
       </a-table>
     </div>
+    <!--    /table表格区域-->
     <working-group-project-module ref="modalForm" @ok="modalFormOk"></working-group-project-module>
   </a-card>
 </template>
 
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
-import JDate from '@comp/jero/JDate'
+import JYearDate from '@comp/jero/JYearDate'
 import WorkingGroupProjectModule from '@views/projectManagement/modules/WorkingGroupProjectModule'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 import ProgressBar from '@comp/ProgressBar'
 
 export default {
   name: 'WorkingGroupProjectManagement',
-  components: { JDate, WorkingGroupProjectModule, SelectPrincipal, ProgressBar },
+  components: { JYearDate, WorkingGroupProjectModule, SelectPrincipal, ProgressBar },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -151,7 +166,7 @@ export default {
           post: {
             payInFull: 10,
             partialPayment: 8,
-            nonPayment: 12,
+            nonPayment: 12
           }
         }
       ]
@@ -194,4 +209,38 @@ export default {
     cursor: pointer;
   }
 }
+
+.tooltip {
+  float: right;
+  width: auto;
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
+  height: 40px;
+
+  &-item {
+    margin-right: 10px;
+    display: flex;
+    align-items: center;
+  }
+
+  &-color {
+    width: 15px;
+    height: 15px;
+    margin-right: 5px;
+    border-radius: 2px;
+  }
+
+  &-pay-in-full {
+    background-color: rgb(7, 168, 161);
+  }
+
+  &-partial-payment {
+    background-color: rgb(0, 133, 192);
+  }
+
+  &-non-payment {
+    background-color: rgb(232, 232, 232);
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 223683e..ec6a9d7 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -22,8 +22,8 @@
       <a-row>
         <a-col :xl="12" :sm="24">
           <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date show-type="year" date-format="YYYY" placeholder="请选择运行年份"
-                    v-decorator="['year',validatorRules.year]"></j-date>
+            <j-year-date style="width:100%" placeholder="请选择运行年份"
+                         v-decorator="['year',validatorRules.year]"></j-year-date>
           </a-form-item>
         </a-col>
         <a-col :xl="12" :sm="24">
@@ -46,7 +46,9 @@
         </a-col>
         <a-col :xl="12" :sm="24">
           <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-dict-select-tag v-decorator="['chargeUse',validatorRules.chargeUse]" placeholder="请选择来款用途"
+            <j-dict-select-tag v-decorator="['chargeUse', validatorRules.chargeUse]"
+                               :triggerChange="true"
+                               placeholder="请选择来款用途"
                                dictCode="payment_charge_use"/>
           </a-form-item>
         </a-col>
@@ -139,7 +141,7 @@
                 placeholder="请输入备注"
                 :auto-size="{ minRows: 3, maxRows: 6 }"
                 v-decorator="['remarks']"
-                :maxLength='300'
+                :maxLength='200'
                 @change="e => {e.target.value = (e.target.value + '').trim()}"/>
           </a-form-item>
         </a-col>
@@ -151,7 +153,7 @@
 <script>
 import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
-import JDate from '@comp/jero/JDate'
+import JYearDate from '@comp/jero/JYearDate'
 import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
 import ContactManagementModule from '@views/businessManagement/modules/ContactManagementModule'
@@ -160,7 +162,7 @@ import SelectContacts from '@comp/company/SelectContacts'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JDate, JUpload, CompanySelect, ContactManagementModule, SelectPrincipal, SelectContacts },
+  components: { JYearDate, JUpload, CompanySelect, ContactManagementModule, SelectPrincipal, SelectContacts },
   data() {
     return {
       title: '操作',
@@ -187,45 +189,60 @@ export default {
       },
       validatorRules: {
         chargeProject: {
-          rules: [{ required: true, message: '请输入项目名称' }]
+          rules: [{ required: true, message: '请输入项目名称' }],
+          validateTrigger: 'blur'
         },
         year: {
-          rules: [{ required: true, message: '请选择运行年份' }]
+          rules: [{ required: true, message: '请选择运行年份' }],
+          validateTrigger: 'blur'
         },
         principalId: {
-          rules: [{ required: true, message: '请选择负责人' }]
+          rules: [{ required: true, message: '请选择负责人' }],
+          validateTrigger: 'blur'
         },
         chargeCompany: {
-          rules: [{ required: true, message: '请选择来款企业' }]
+          rules: [{ required: true, validator: this.checkCompany }],
+          validateTrigger: 'change'
         },
         chargeUse: {
-          rules: [{ required: true, message: '请选择来款用途' }]
+          rules: [{ required: true, message: '请选择来款用途' }],
+          validateTrigger: 'blur'
         },
         contactsId: {
-          rules: [{ required: true, message: '请选择联系人' }]
+          rules: [{ required: true, message: '请选择联系人' }],
+          validateTrigger: 'blur'
         },
         mailContactsId: {
-          rules: [{ required: true, message: '请选择邮寄联系人' }]
+          rules: [{ required: true, message: '请选择邮寄联系人' }],
+          validateTrigger: 'blur'
         },
         receivableAmount: {
-          rules: [{ required: true, message: '请输入应收金额' }]
+          rules: [{ required: true, message: '请输入应收金额' }],
+          validateTrigger: 'blur'
         },
         invoice: {
-          rules: [{ required: true, message: '请选择发票类型' }]
+          rules: [{ required: true, message: '请选择发票类型' }],
+          validateTrigger: 'blur'
         },
         chargeWay: {
-          rules: [{ required: true, message: '请选择来款方式' }]
+          rules: [{ required: true, message: '请选择来款方式' }],
+          validateTrigger: 'blur'
         },
         contractNum: {
-          rules: [{ required: true, message: '请输入合同号' }]
+          rules: [{ required: true, message: '请输入合同号' }],
+          validateTrigger: 'blur'
         },
         chargeNoticeNo: {
-          rules: [{ required: true, message: '请输入收费通知号' }]
+          rules: [{ required: true, message: '请输入收费通知号' }],
+          validateTrigger: 'blur'
         }
       },
-      userList: [], // 用户列表
       chargeWayType: null,
-      selectedCompany: null
+      selectedCompany: null,
+      url: {
+        add: '/project/payCommonProject/add',
+        edit: '/project/payCommonProject/edit'
+      }
     }
   },
   methods: {
@@ -233,8 +250,16 @@ export default {
       this.edit({})
     },
     edit(record) {
+      console.log(record)
+      record.chargeCompany = {
+        id: record.chargeCompanyId,
+        companyName: record.chargeCompanyName
+      }
+      // 回显选中的企业
+      this.selectedCompany = record.chargeCompany
       this.form.resetFields()
       this.model = Object.assign({}, record)
+      this.chargeWayType = record.chargeWay
       this.visible = true
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'chargeProject', 'year', 'principalId', 'chargeCompany', 'chargeUse', 'contactsId', 'mailContactsId', 'receivableAmount', 'invoice', 'chargeWay', 'contractNum', 'chargeNoticeNo', 'remarks'))
@@ -242,6 +267,8 @@ export default {
     },
     close() {
       this.$emit('close')
+      this.chargeWayType = null
+      this.selectedCompany = null
       this.visible = false
     },
     handleOk() {
@@ -291,12 +318,26 @@ export default {
     companyChange(value) {
       console.log(1)
       this.selectedCompany = value
+      console.log(this.model.contactsId, this.model.mailContactsId)
       this.model.contactsId = undefined
       this.model.mailContactsId = undefined
       this.$nextTick(() => {
         this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId'))
       })
     },
+    /**
+     * 企业必填校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkCompany(rules, value, callback) {
+      if (value.id && value.companyName) {
+        callback()
+        return
+      }
+      callback('请选择企业')
+    },
     /**
      * 在新增成功后重新获取联系人列表
      */
diff --git a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
index 6b71da5..b2bd0d1 100644
--- a/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupProjectModule.vue
@@ -26,8 +26,8 @@
       <a-row>
         <a-col :span="12">
           <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-date show-type="year" date-format="YYYY" placeholder="请选择运行年份"
-                    v-decorator="['year',validatorRules.year]"></j-date>
+            <j-year-date style="width:100%" placeholder="请选择运行年份"
+                         v-decorator="['year',validatorRules.year]"></j-year-date>
           </a-form-item>
         </a-col>
       </a-row>
@@ -148,7 +148,7 @@
                 placeholder="请输入备注"
                 :auto-size="{ minRows: 3, maxRows: 6 }"
                 v-decorator="['remarks']"
-                :maxLength='300'
+                :maxLength='200'
                 @change="e => {e.target.value = (e.target.value + '').trim()}"/>
           </a-form-item>
         </a-col>
@@ -161,12 +161,12 @@
 import pick from 'lodash.pick'
 import { httpAction } from '@api/manage'
 import JUpload from '@comp/jero/JUpload'
-import JDate from '@comp/jero/JDate'
+import JYearDate from '@comp/jero/JYearDate'
 import SelectPrincipal from '@comp/company/SelectPrincipal'
 
 export default {
   name: 'WorkingGroupProjectModule',
-  components: { JUpload, JDate, SelectPrincipal },
+  components: { JUpload, JYearDate, SelectPrincipal },
   data() {
     return {
       title: '操作',
@@ -193,13 +193,16 @@ export default {
       },
       validatorRules: {
         workingGroupProject: {
-          rules: [{ required: true, message: '请输入项目名称' }]
+          rules: [{ required: true, message: '请输入项目名称' }],
+          validateTrigger: 'blur'
         },
         year: {
-          rules: [{ required: true, message: '请选择运行年份' }]
+          rules: [{ required: true, message: '请选择运行年份' }],
+          validateTrigger: 'blur'
         },
         principalIdA: {
-          rules: [{ required: true, message: '请选择负责人A' }]
+          rules: [{ required: true, message: '请选择负责人A' }],
+          validateTrigger: 'blur'
         }
       },
       userList: [], // 用户列表