[update] 修改会员成员维护

src/api/incomePaymentsApi.js

@@ -145,6 +145,15 @@ const getWorkingGroupList = (param) => getAction('/drafting/payDraftingGroup/que
 const getDraftingGroupById = (params) => getAction('/drafting/payDraftingGroup/queryById', params)
 // 起草组会议的发布提醒
 const draftGroupPublishRemind = (param) => postAction('/meeting/draftGroupMeeting/publishReminder', param)
+
+// 2024年2月变更
+// 标协会员-会员管理 相关接口
+// 根据id获取标协会员项目信息
+const getStardsMemberProjectById = (params) => getAction('', params)
+// 标协会员单位信息-提票
+const memberDrawTicket = (params) => getAction('', params)
+// 标协会员单位信息-复制
+const memberCopy = (params) => getAction('', params)
 export {
   getWorkingGroupById,
   getChargeNotice,
@@ -216,9 +225,13 @@ export {
 
 
   judgeEmailStatus,
-  
+
   copyDraftingGroup,
   getWorkingGroupList,
   getDraftingGroupById,
   draftGroupPublishRemind,
+
+  getStardsMemberProjectById,
+  memberDrawTicket,
+  memberCopy
 }

src/components/ProjectDetailModal.vue

@@ -86,6 +86,28 @@
     </section>
     <!-- 基本信息end-->
 
+    <!-- 会员权益begin -->
+    <section class="enterprise-info">
+      <h3 class="title">会员权益</h3>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>会员编号：</label>
+          <span><j-ellipsis :value="basicInfo.companyName" :length="20"></j-ellipsis></span>
+        </a-col>
+      </a-row>
+      <a-row :gutter="24">
+        <a-col :span="12" class="detail-item">
+          <label>生效日期：</label>
+          <span><j-ellipsis :value="basicInfo.companyAddress" :length="20"></j-ellipsis></span>
+        </a-col>
+        <a-col :span="12" class="detail-item">
+          <label>失效日期：</label>
+          <span><j-ellipsis :value="basicInfo.dutyCode" :length="20"></j-ellipsis></span>
+        </a-col>
+      </a-row>
+    </section>
+    <!-- 会员权益end -->
+
     <!-- 企业信息begin-->
     <section class="enterprise-info">
       <h3 class="title">企业信息</h3>

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -46,7 +46,7 @@
               <j-dict-select-tag
                 placeholder="请选择会员状态"
                 v-model="queryParam.companyName"
-                dict-code=""
+                dict-code="member_status"
               ></j-dict-select-tag>
             </a-form-item>
           </a-col>
@@ -114,6 +114,7 @@
         导出
       </a-button>
       <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
+      <a-button type="primary" icon="copy" @click="handleMemberBatchCopy">批量复制</a-button>
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
       <!--                @change="handleImportExcel">-->
       <!--        <a-button type="primary" icon="import">导入</a-button>-->
@@ -183,12 +184,19 @@
         <span slot="action" slot-scope="text, record" class="action-span-cell">
           <a @click="handleEdit(record)">编辑</a>
           <a @click="handleDelete(record.id)">删除</a>
+          <a @click="handleDrawTicket(record)">提票</a>
+          <a @click="handleMemberCopy(record)">复制</a>
+          <a @click="handleMemberEquity(record)">编辑会员权益</a>
         </span>
       </a-table>
     </div>
     <project-detail-modal ref="projectDetail"></project-detail-modal>
     <!--  标协会员单位信息新增、编辑弹框  -->
     <safeguard-stards-member-modal ref="modalForm" @ok="modalFormOk" :base-info="stardsMemberDetail"></safeguard-stards-member-modal>
+    <!--  编辑会员权益弹框  -->
+    <member-equity-modal ref="memberEquityModal" @ok="modalFormOk"></member-equity-modal>
+    <!--  复制，选会员弹框  -->
+    <member-copy-modal ref="memberCopyModal" @ok="modalFormOk"></member-copy-modal>
   </a-card>
 </div>
 </template>
@@ -203,6 +211,9 @@ import PageHeaderTitle from '@comp/layouts/PageHeaderTitle'
 import { formatMoney } from '@/utils/formatMoney'
 import PreviewFile from '@/components/jero/PreviewFile'
 import SafeguardStardsMemberModal from './modules/SafeguardStardsMemberModal'
+import { getStardsMemberProjectById, memberDrawTicket } from '@/api/incomePaymentsApi'
+import MemberEquityModal from './modules/MemberEquityModal'
+import MemberCopyModal from './modules/MemberCopyModal'
 
 export default {
   name: 'SafeguardStardsMemberList',
@@ -212,7 +223,9 @@ export default {
     StatusSlot,
     PageHeaderTitle,
     PreviewFile,
-    SafeguardStardsMemberModal
+    SafeguardStardsMemberModal,
+    MemberEquityModal,
+    MemberCopyModal
   },
   data() {
     return {
@@ -332,24 +345,77 @@ export default {
           align: 'center',
           dataIndex: 'mail',
           scopedSlots: { customRender: 'status-mail' },
+        },
+        {
+          title: '操作',
+          align: 'center',
+          dataIndex: '',
+          scopedSlots: {customRender: 'action'}
         }
       ],
       disableMixinCreated: true,
       url: {
         list: '/member/tbMemberProjectSubitem/page',
         exportXlsUrl: '/member/tbMemberProjectSubitem/exportXls',
-      },
+      }
     }
   },
   created() {
     this.filters.projectId = this.$route.query.id
+    this.getStardsMemberProjectInfo(this.$route.query.id)
     this.loadData(1)
   },
   methods: {
     formatMoney,
+    // 获取标协会员项目信息
+    getStardsMemberProjectInfo (id) {
+      getStardsMemberProjectById({id: id}).then(res => {
+        if (res.success) {
+          this.stardsMemberDetail = res.result
+        }
+      })
+    },
     onDateChange (value, dateString) {
       this.queryParam.estimatedArrivalStartDate = dateString[0]
       this.queryParam.estimatedArrivalEndDate = dateString[1]
+    },
+    // 提票
+    handleDrawTicket (record) {
+      this.$confirm({
+        title: '确认提票',
+        content: '确定要提票吗?',
+        onOk: () => {
+          memberDrawTicket({id: record.id}).then((res) => {
+            if (res.success) {
+              this.$message.success(res.message)
+              // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
+              if (this.ipagination.current > 1 && ((this.ipagination.current - 1) * this.ipagination.pageSize) + 1 === this.ipagination.total) {
+                this.ipagination.current -= 1
+              }
+              this.loadData()
+            } else {
+              this.$message.warning(res.message)
+            }
+          })
+        }
+      })
+    },
+    // 复制
+    handleMemberCopy (record) {
+      this.$refs.memberCopyModal.open(record.id)
+    },
+    // 批量复制
+    handleMemberBatchCopy () {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录！')
+        return
+      }
+      const ids = this.selectedRowKeys.join(',')
+      this.$refs.memberCopyModal.open(ids)
+    },
+    // 编辑会员权益
+    handleMemberEquity (record) {
+      this.$refs.memberEquityModal.edit(record)
     }
   }
 }

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

@@ -0,0 +1,181 @@
+<template>
+  <j-modal :title="title"
+           :width="width"
+           :visible="visible"
+           :confirmLoading="confirmLoading"
+           switchFullscreen
+           @ok="handleOk"
+           @cancel="handleCancel"
+           cancelText="关闭">
+    <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-input placeholder="请输入会员项目" v-model="queryParam.projectName"  :maxLength='50'></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" class="reset-button">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+
+      <!--    表格区域-->
+      <div>
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :scroll="{x: 800}"
+          :columns="columns"
+          :dataSource="dataSource"
+          :pagination="ipagination"
+          :loading="loading"
+          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio'}"
+          @change="handleTableChange"
+          class="j-table-force-nowrap">
+
+          <template slot="text" slot-scope="text">
+            <j-ellipsis v-if="!!text" :value="text" :length="20"></j-ellipsis>
+            <span v-else></span>
+          </template>
+
+          <!--        打包、需要发票、到账、开票、邮寄状态-->
+          <template slot="status" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text" :status-type="true"></status-slot>
+          </template>
+
+          <template slot="status-pack" slot-scope="text,record">
+            <status-slot :statu-obj="record" :status-no="text"></status-slot>
+          </template>
+        </a-table>
+      </div>
+      <!--    /表格区域-->
+    </div>
+  </j-modal>
+</template>
+
+<script>
+import {JeroListMixin} from '@/mixins/JeroListMixin'
+import { memberCopy } from '@/api/incomePaymentsApi'
+
+export default {
+  name: 'MemberCopyModal',
+  mixins: [JeroListMixin],
+  data() {
+    return {
+      title: '会员项目列表',
+      width: 1200,
+      visible: false,
+      confirmLoading: false,
+      columns: [
+        {
+          title: '序号',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+        {
+          title: '会员项目',
+          align: 'center',
+          dataIndex: 'projectName',
+          width: 200,
+          scopedSlots: {customRender: 'text'},
+        },
+        {
+          title: '收费标准',
+          align: 'center',
+          dataIndex: 'chargeStandard',
+          width: 100,
+          scopedSlots: {customRender: 'text'},
+        },
+        {
+          title: '负责人',
+          align: 'center',
+          dataIndex: 'directorName',
+          scopedSlots: {customRender: 'text'},
+          width: 200,
+        },
+        {
+          title: '创建时间',
+          align: 'center',
+          dataIndex: 'createTime',
+          scopedSlots: {customRender: 'text'},
+          width: 200,
+        },
+      ],
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 5}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 10}
+      },
+      url: {
+        // todo: 需要不分页的没有权限的接口
+        list: '/member/tbMemberProject/page',
+      },
+      disableMixinCreated: true,
+      memberIds: ''
+    }
+  },
+  methods: {
+    open (ids) {
+      this.memberIds = ids
+      this.loadData()
+      this.visible = true
+    },
+    close() {
+      this.queryParam = {}
+      this.visible = false
+    },
+    handleOk() {
+      if (this.confirmLoading) {
+        return
+      }
+      this.confirmLoading = true
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择项目后再提交')
+        this.confirmLoading = false
+        return
+      }
+      const param = {}
+      param.memberId = this.memberIds
+      param.projectId = this.selectedRowKeys[0]
+      memberCopy(param).then(res => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.close()
+          this.$emit('ok')
+          this.confirmLoading = false
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally( () => {
+        setTimeout(() => {
+          this.confirmLoading = false
+        }, 1000)
+      } )
+    },
+    handleCancel() {
+      this.close()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,133 @@
+<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="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入会员编号"
+                       v-decorator="['memberNo']"
+                       :maxLength="50"
+                       disabled></a-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="24" :sm="24">
+            <a-form-item label="生效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-date-picker style="width:100%" placeholder="请选择生效日期"
+                             valueFormat="YYYY-MM-DD"
+                             format="YYYY-MM-DD"
+                             v-decorator="['effectiveDate',validatorRules.effectiveDate]">
+              </a-date-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="24" :sm="24">
+            <a-form-item label="失效日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-date-picker style="width:100%" placeholder="请选择失效日期"
+                             valueFormat="YYYY-MM-DD"
+                             format="YYYY-MM-DD"
+                             v-decorator="['expiryDate',validatorRules.expiryDate]">
+              </a-date-picker>
+            </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 pick from 'lodash.pick'
+import { postAction } from '@/api/manage'
+
+export default {
+  name: 'MemberEquityModal',
+  data() {
+    return {
+      title: '编辑会员权益',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      form: this.$form.createForm(this),
+      model: {},
+      labelCol: {
+        xs: {span: 24},
+        sm: {span: 4}
+      },
+      wrapperCol: {
+        xs: {span: 24},
+        sm: {span: 18}
+      },
+      validatorRules: {
+        effectiveDate: {
+          rules: [{required: true, message: '请选择生效日期'}],
+          validateTrigger: 'change'
+        },
+        expiryDate: {
+          rules: [{required: true, message: '请选择失效日期'}],
+          validateTrigger: 'change'
+        }
+      },
+      url: {
+        edit: '/jero/memberProject/edit',
+      }
+    }
+  },
+  methods: {
+    edit(record) {
+      this.form.resetFields()
+      this.model = Object.assign({}, record)
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'memberNo', 'effectiveDate', 'expiryDate'))
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          that.confirmLoading = true
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          postAction(this.url.edit, formData).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()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>