[update] 标协会员-会员管理，以及其他资料维护

src/enums/commonEnums.js

@@ -36,3 +36,17 @@ export const LinkTopicsEnums = {
   default: {name: '焦点论坛(默认专题)', index: 99}
 }
 
+// 会员性质
+export const MemberNature = {
+  viceChairmanUnit: { name: '副理事长单位', value: '1'},
+  governingUnit: { name: '理事单位', value: '2'},
+  memberUnit: { name: '会员单位', value: '3'},
+}
+
+// 来款方式
+export const IncomeMethod = {
+  notHave: { name: '无', value: '1'},
+  contract: { name: '合同', value: '2'},
+  noticeOfCharge: { name: '收费通知', value: '3'},
+}
+

src/views/incomePayments/memberManage/StardsMemberProjectDataMaintenance.vue

@@ -0,0 +1,210 @@
+<template>
+  <div>
+    <page-header-title level-two-title="其他资料维护" :is-level-one="false"></page-header-title>
+    <a-card :bordered="false">
+      <!--    查询区域-start -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row>
+            <a-col :xxl="4" :xl="10" :lg="12" :md="12" :sm="24">
+              <a-form-item label="文件名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-input placeholder="请输入文件名称" v-model="queryParam.fileName" :maxLength='50'></a-input>
+              </a-form-item>
+            </a-col>
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" icon="search" @click="searchQuery" v-has="'fileMaintenance:search'">查询</a-button>
+              <a-button icon="reload" @click="searchReset" class="reset-button">重置</a-button>
+            </span>
+          </a-row>
+        </a-form>
+      </div>
+      <!--    /查询区域-end-->
+
+      <!--    操作按钮区域-->
+      <div class="table-operator">
+        <a-button type="primary" icon="plus" @click="handleAdd" v-has="'fileMaintenance:add'">上传</a-button>
+        <a-button type="danger" icon="delete" @click="batchDel" v-has="'fileMaintenance:batchDel'">批量删除</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('资料维护列表')" v-has="'fileMaintenance:export'">导出
+        </a-button>
+      </div>
+      <!--    操作按钮区域-end-->
+
+      <!--    table表格区域-->
+      <div>
+        <a-table
+          size="middle"
+          ref="table"
+          bordered
+          rowKey="id"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :scroll="{x: 1200}"
+          @change="handleTableChange"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+          class="j-table-force-nowrap main-table">
+
+          <!--        项目名称-->
+          <template slot="projectName" slot-scope="text, record">
+            <j-ellipsis :value="text" :length="18" class="primary-color"
+                        @click="openDetailModal(record)"></j-ellipsis>
+          </template>
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis :value="text" :length="20"></j-ellipsis>
+          </template>
+
+          <span slot="action" class="action-span-cell" slot-scope="text, record">
+            <a @click="handleDownload(record)" v-has="'fileMaintenance:download'">下载</a>
+            <a @click="handleDelete(record.id)" v-has="'fileMaintenance:delete'">删除</a>
+          </span>
+        </a-table>
+      </div>
+    </a-card>
+
+    <!--    上传-->
+    <stards-member-project-data-upload-modal
+      ref="modalForm"
+      @ok="modalFormOk"
+      :project-id="projectId"></stards-member-project-data-upload-modal>
+  </div>
+</template>
+
+<script>
+import { JeroListMixin } from '@/mixins/JeroListMixin'
+import PageHeaderTitle from '@/components/layouts/PageHeaderTitle'
+import StardsMemberProjectDataUploadModal from './modules/StardsMemberProjectDataUploadModal'
+import { downloadFile, postAction } from '@/api/manage'
+
+export default {
+  name: 'StardsMemberProjectDataMaintenance',
+  components: { PageHeaderTitle, StardsMemberProjectDataUploadModal },
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 10 }
+      },
+      url: {
+        list: '/member/tbMemberProjectFile/page',
+        exportXlsUrl: '/member/tbMemberProjectFile/exportXls',
+        delete: '/member/tbMemberProjectFile/delete',
+        deleteBatch: '/member/tbMemberProjectFile/deleteBatch'
+      },
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 100,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        }, {
+          title: '文件名称',
+          align: 'center',
+          dataIndex: 'fileName',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '下载次数',
+          align: 'center',
+          width: 160,
+          dataIndex: 'downloadCount',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '上传时间',
+          align: 'center',
+          width: 220,
+          dataIndex: 'createTime',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '上传人',
+          align: 'center',
+          width: 160,
+          dataIndex: 'createBy',
+          scopedSlots: { customRender: 'text' }
+        }, {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 160,
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      disableMixinCreated: true,
+      projectId: null
+    }
+  },
+  created () {
+    this.filters.projectId = this.$route.query.projectId
+    this.projectId = this.filters.projectId
+    this.loadData()
+  },
+  methods: {
+    /**
+     * 下载
+     * @param record
+     */
+    handleDownload(record) {
+      downloadFile(`sys/common/download/${record.fileId}`, record.fileName)
+    },
+    handleExportXls(fileName) {
+      if (!fileName || typeof fileName != 'string') {
+        fileName = '导出文件'
+      }
+      let param = this.getQueryParams()
+      if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
+        param['selections'] = this.selectedRowKeys.join(',')
+      }
+      console.log('导出参数', param)
+      downloadFile(this.url.exportXlsUrl, fileName + '.zip', param)
+    },
+    handleAdd () {
+      this.$refs.modalForm.add()
+      this.$refs.modalForm.title = '上传文件'
+      this.$refs.modalForm.disableSubmit = false
+    },
+    handleDelete (id) {
+      if (!this.url.delete) {
+        this.$message.error('请设置url.delete属性!')
+        return
+      }
+      let that = this
+      this.$confirm({
+        title: '确认删除',
+        content: '确定要删除此条数据吗?',
+        onOk: () => {
+          postAction(that.url.delete, {id: id}).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
+              if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
+                that.ipagination.current -= 1
+              }
+              that.loadData()
+            } else {
+              if (res.message.indexOf('<br/>') > -1) {
+                that.messageLineFeed('删除失败', res.message)
+              } else {
+                that.$message.warning(res.message)
+              }
+            }
+          })
+        }
+      })
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+</style>

src/views/incomePayments/memberManage/StardsMemberProjectList.vue

@@ -24,9 +24,9 @@
 
       <!-- 操作按钮区域 -->
       <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>-->
+        <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>
         <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
         <!--                @change="handleImportExcel">-->
         <!--        <a-button type="primary" icon="import">导入</a-button>-->
@@ -58,13 +58,18 @@
             <a @click="handleCertificate(record)" v-has="'stardsMember:meetingMaintenance'">证书维护</a>
           </template>
 
-          <template slot="action" slot-scope="text, record" class="action-span-cell">
+          <span slot="action" slot-scope="text, record" class="action-span-cell">
+            <a @click="handleEdit(record)">编辑</a>
+            <a @click="handleDelete(record.id)">删除</a>
+            <a @click="handleOtherData(record)">其他资料</a>
             <a @click="handleStandardMeeting(record)" v-has="'stardsMember:meetingMaintenance'">会议维护</a>
-          </template>
+            <a @click="handleMeetingApplyInfo(record)">会议报名信息维护</a>
+          </span>
 
         </a-table>
       </div>
     </a-card>
+    <stards-member-project-modal ref="modalForm" @ok="modalFormOk"></stards-member-project-modal>
   </div>
 </template>
 
@@ -73,12 +78,14 @@ import {mixinDevice} from '@/utils/mixin'
 import {JeroListMixin} from '@/mixins/JeroListMixin'
 import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import IconImg from '@/assets/imgs/icon/icon_stander_member.png'
+import StardsMemberProjectModal from './modules/StardsMemberProjectModal'
 
 export default {
   name: 'StardsMemberProject',
   mixins: [JeroListMixin, mixinDevice],
   components: {
-    PageHeaderTitle
+    PageHeaderTitle,
+    StardsMemberProjectModal
   },
   data() {
     return {
@@ -102,10 +109,16 @@ export default {
           scopedSlots: {customRender: 'htmlSlot'}
         },
         {
-          title: '标协证书',
+          title: '收费标准',
           align: 'center',
-          dataIndex: 'certificate',
-          scopedSlots: {customRender: 'certificate'}
+          dataIndex: 'chargeStandard',
+          scopedSlots: {customRender: 'text'}
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName',
+          scopedSlots: {customRender: 'text'}
         },
         {
           title: '操作',
@@ -116,6 +129,9 @@ export default {
       ],
       url: {
         list: '/member/tbMemberProject/page',
+        delete: '/member/tbMemberProject/delete',
+        deleteBatch: '/member/tbMemberProject/deleteBatch',
+        exportXlsUrl: '/member/tbMemberProject/exportXls'
       },
     }
   },
@@ -158,6 +174,19 @@ export default {
           projectName: record.projectName
         }
       })
+    },
+    // 其他资料
+    handleOtherData (record) {
+      this.$router.push({
+        path: '/incomePayments/memberManage/StardsMemberProjectDataMaintenance',
+        query: {
+          projectId: record.id
+        }
+      })
+    },
+    // 会议报名信息维护
+    handleMeetingApplyInfo (record) {
+
     }
   }
 }

src/views/incomePayments/memberManage/modules/StardsMemberProjectDataUploadModal.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">
+              <j-upload file-type="all"
+                        file-type-error-message="请上传文件"
+                        :multiple="true"
+                        :number="10"
+                        :return-id="true"
+                        v-decorator="['fileId', validatorRules.fileId]"
+                        :trigger-change="true"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { postAction } from '@/api/manage'
+import JUpload from '@comp/jero/JUpload'
+
+export default {
+  name: 'StardsMemberProjectDataUploadModal',
+  components: { JUpload },
+  props: {
+    // 项目id
+    projectId: {
+      type: String,
+      required: false,
+      default: ''
+    },
+  },
+  data() {
+    return {
+      title: '编辑',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      fileList: [],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 17 }
+      },
+      validatorRules: {
+        fileId: {
+          rules: [{ required: true, message: '请上传文件' }],
+          validateTrigger: 'change'
+        }
+      },
+      url: {
+        add: '/member/tbMemberProjectFile/add', // 资料上传
+        edit: '' // 资料和会议的编辑 post
+      }
+    }
+  },
+  methods: {
+    add(data) {
+      this.edit({}, data)
+    },
+    edit(record, data) {
+      this.dataType = data // 接收数据类型
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'dataId'))
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      if (this.confirmLoading) {
+        return
+      }
+      this.confirmLoading = true
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          console.log(values)
+          let params = values
+          params.projectId = this.projectId
+          postAction(this.url.add, params).then((res) => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warning(res.message)
+            }
+          }).finally(() => {
+            setTimeout(() => {
+              this.confirmLoading = false
+            }, 1000)
+          })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/incomePayments/memberManage/modules/StardsMemberProjectModal.vue

@@ -0,0 +1,264 @@
+<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 :gutter="24">
+          <a-col :xl="24" :sm="24">
+            <a-form-item label="标协会员项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-input placeholder="请输入标协会员项目"
+                       v-decorator="['projectName',validatorRules.projectName]"
+                       :maxLength='50'
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="运行年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <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">
+            <a-form-item label="负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <select-principal placeholder="请选择负责人"  v-decorator="['directorId',validatorRules.directorId]"></select-principal>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入收费标准"
+                       :maxLength='50'
+                       v-decorator="[ 'chargeStandard',validatorRules.chargeStandard]"
+                       @blur="addZero"
+                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"></a-input>
+              <span class="yuan">元</span>
+            </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="请输入收费通知号"
+                       :maxLength='50'
+                       v-decorator="[ 'chargeNoticeNo']"
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="收费通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload file-type="pdf" file-type-error-message="请上传收费通知" :multiple="false" :number="1" :return-id="true"
+                        bizPath="payment" v-decorator="['chargeNoticeFileId']"
+                        :trigger-change="true"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="24">
+          <a-col :xl="12" :sm="24">
+            <a-form-item label="理事会收费标准" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入理事会收费标准"
+                       :maxLength='50'
+                       v-decorator="[ 'councilChargeStandard',validatorRules.councilChargeStandard]"
+                       @blur="addZero"
+                       @change="(e) => {e.target.value = e.target.value.replace(/[^0-9.]/g,'')}"></a-input>
+              <span class="yuan">元</span>
+            </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="请输入理事会收费通知号"
+                       :maxLength='50'
+                       v-decorator="[ 'councilChargeNoticeNo']"
+                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="理事会收费通知" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload file-type="pdf" file-type-error-message="请上传理事会收费通知" :multiple="false" :number="1" :return-id="true"
+                        bizPath="payment" v-decorator="['councilChargeNoticeFileId']"
+                        :trigger-change="true"></j-upload>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row>
+          <a-col>
+            <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-textarea
+                placeholder="请输入备注"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
+                :maxLength='200'
+                v-decorator="['remark']"
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-spin>
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-preventclick>确定</a-button>
+    </template>
+  </j-modal>
+</template>
+
+<script>
+import JYearDate from '@comp/jero/JYearDate'
+import JUpload from '@comp/jero/JUpload'
+import SelectPrincipal from '@comp/company/SelectPrincipal'
+import pick from 'lodash.pick'
+import { httpAction } from '@/api/manage'
+import { money } from '@/utils/validate'
+import { addZero } from '@/utils/util'
+
+export default {
+  name: 'StardsMemberProjectModal',
+  components: {
+    JYearDate,
+    JUpload,
+    SelectPrincipal
+  },
+  data () {
+    return {
+      title: '操作',
+      width: 1000,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      // 负责人
+      chargePersonList: [],
+      model: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 8}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 16}
+      },
+      remarksLabelCol: {
+        xs: {span: 24},
+        sm: {span: 4}
+      },
+      remarksWrapperCol: {
+        xs: {span: 24},
+        sm: {span: 20}
+      },
+      validatorRules: {
+        projectName: {
+          rules: [{required: true, message: '请输入标协会员项目'}],
+          validateTrigger: 'blur'
+        },
+        // 收费标准
+        chargeStandard:{
+          rules: [
+            {required: false, validator: this.validateMoney},
+          ],
+          validateTrigger: ['blur']
+        },
+        // 理事会收费标准
+        councilChargeStandard:{
+          rules: [
+            {required: false, validator: this.validateMoney},
+          ],
+          validateTrigger: ['blur']
+        },
+        year: {
+          rules: [{required: true, message: '请选择年份'}],
+          validateTrigger: ['change','blur']
+        },
+        directorId: {
+          rules: [{required: true, message: '请选择负责人'}],
+          validateTrigger: ['change','blur']
+        }
+      },
+      url: {
+        add: '/member/tbMemberProject/add',
+        edit: '/member/tbMemberProject/edit',
+      }
+    }
+  },
+  methods: {
+    addZero,
+    add() {
+      this.edit({})
+    },
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'projectName', 'year', 'directorId', 'chargeStandard', 'chargeNoticeNo', 'chargeNoticeFileId', 'councilChargeStandard',  'councilChargeNoticeNo', 'councilChargeNoticeFileId', 'remark'))
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl = this.url.add
+            method = 'post'
+          } else {
+            httpurl = this.url.edit
+            method = 'post'
+          }
+          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.confirmLoading = false
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+          })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    validateMoney(rule, value, callback) {
+      if(value){
+        if (value && money(value)) {
+          callback()
+        } else {
+          callback('请输入合法的金额数字，最多2位小数,10位整数')
+        }
+      }else {
+        callback()
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+.yuan {
+  position: absolute;
+  right: -20px;
+  top: -10px;
+}
+</style>