[update] 到账开票审核

src/api/incomePaymentsApi.js

@@ -97,6 +97,8 @@ const getUserByDepartCode = (param) => getAction('/statistics/allProjectStatisti
 const cancellationContract = (param) => postAction('/contract/payIncomeContract/cancellation', param)
 // 支出合同--作废
 const cancellationExpenditureContract = (param) => postAction('/contract/paySpendingContract/cancellation', param)
+// 到账开票审核缴费凭证时获取最新一条缴费信息
+const getLastProofInfo = (param) => getAction('/paymentCheck/payPaymentCheck/getLastRecord', param)
 
 export {
   getWorkingGroupById,
@@ -146,5 +148,6 @@ export {
   getUserByDepartCode,
   cancellationContract,
   councilPublishRemind,
-  cancellationExpenditureContract
+  cancellationExpenditureContract,
+  getLastProofInfo
 }

src/components/PreviewImgModal.vue

@@ -0,0 +1,49 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @cancel="handleCancel"
+    cancelText="关闭">
+
+    <img :src="imgSrc" class="preview-img">
+
+    <template slot="footer">
+      <a-button @click="handleCancel">关闭</a-button>
+    </template>
+  </j-modal>
+</template>
+
+<script>
+export default {
+  name: 'PreviewImgModal',
+  data() {
+    return {
+      title: '图片',
+      width: 800,
+      visible: false,
+      confirmLoading: false,
+      // 图片id
+      imgId: ''
+    }
+  },
+  computed: {
+    imgSrc() {
+      return `${ window._CONFIG['domianURL'] }/sys/common/download/${ this.imgId }`
+    }
+  },
+  methods: {
+    handleCancel() {
+      this.visible = false
+    }
+  }
+}
+</script>
+
+<style scoped>
+.preview-img {
+  width: 100%;
+}
+</style>

src/components/company/BusinessSelect.vue

@@ -61,10 +61,18 @@
 
 <script>
 import { JeroListMixin } from '@/mixins/JeroListMixin'
+import { getAction } from '../../api/manage'
 
 export default {
   name: 'BusinessSelect',
   mixins: [JeroListMixin],
+  props: {
+    // 理事会时需要传2，默认为0
+    memberNature: {
+      type: Number,
+      default: null
+    }
+  },
   data() {
     return {
       title: '选择企业',
@@ -99,6 +107,47 @@ export default {
     }
   },
   methods: {
+    /**
+     * 重写获取数据方法，理事会需要传参
+     * @param arg
+     */
+    loadData(arg) {
+      console.log(this.memberNature)
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      let params = this.getQueryParams()//查询条件
+      // 是理事会单位则需要传参
+      if (this.memberNature && this.memberNature === 2) {
+        params.memberNature = this.memberNature
+      }
+      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 || res.result
+          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
+      })
+    },
     handleOk() {
       this.$emit('ok', this.selectedCompany)
       this.close()
@@ -119,13 +168,13 @@ export default {
     * */
     searchReset() {
       //  调用无权限接口
-      if(this.isLimit){
+      if (this.isLimit) {
         this.url.list = '/company/payCompanyManagement/listMeeting'
       }
       this.lastQueryParam = {}
       this.queryParam = {}
       this.loadData(1)
-    },
+    }
   }
 }
 </script>

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -103,7 +103,12 @@
           </template>
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
-<!--            未审核通过的会议项目不允许在这里来款-->
+            <!--            待审核状态显示审核按钮-->
+            <!--             v-if="record.paymentStatus === 'toBeReviewed'"-->
+            <a @click="auditProof(record)"
+               v-has="'incomePaymentAndInvoiving:audit'"
+            >审核</a>
+            <!--            未审核通过的会议项目不允许在这里来款-->
             <a @click="incomePayment(record)"
                v-has="'incomePaymentAndInvoiving:incomePayment'"
                :disabled="record.projectType === 3 && record.registerCheckResult === '0'">来款</a>
@@ -143,6 +148,9 @@
 
     <project-detail-modal ref="projectDetail"></project-detail-modal>
 
+    <!--    审核缴费凭证-->
+    <audit-proof-module ref="auditProof" @ok="modalFormOk"></audit-proof-module>
+
   </div>
 </template>
 
@@ -158,6 +166,7 @@ import SelectPrincipal from '../../../components/company/SelectPrincipal'
 import ProjectDetailModal from '../../../components/ProjectDetailModal'
 import BatchInvoicingModule from '../../packManagement/modules/BatchInvoicingModule'
 import { isAllEqual } from '../../../utils/util'
+import AuditProofModule from './modules/AuditProofModule'
 
 export default {
   name: 'ArriveAndInvoivingList',
@@ -169,7 +178,8 @@ export default {
     InvoicingStageModule,
     SelectPrincipal,
     ProjectDetailModal,
-    BatchInvoicingModule
+    BatchInvoicingModule,
+    AuditProofModule
   },
   mixins: [JeroListMixin],
   data() {
@@ -235,6 +245,12 @@ export default {
           width: 120,
           dataIndex: 'paidAmount',
           scopedSlots: { customRender: 'text' }
+        }, {
+          title: '缴费凭证状态',
+          align: 'center',
+          width: 160,
+          dataIndex: 'paymentStatus_dictText',
+          scopedSlots: { customRender: 'text' }
         }, {
           title: '需要发票',
           align: 'center',
@@ -391,7 +407,23 @@ export default {
         }
         resolve(arr)
       })
-    }
+    },
+    /**
+     * 审核缴费凭证
+     * @param record
+     */
+    auditProof(record) {
+      // 普通项目、工作组项目、会员项目使用新写的审核逻辑
+      if (record.projectType === 1 || record.projectType === 2 || record.projectType === 4) {
+        this.$refs.auditProof.title = '审核缴费凭证'
+        this.$refs.auditProof.open(record)
+        return
+      }
+      // 会议项目使用原本会议缴费凭证的审核弹窗
+      if (record.projectType === 3) {
+        return
+      }
+    },
   }
 }
 </script>

src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue

@@ -12,7 +12,7 @@
       <div v-for="(item, index) in stageList" :key="index" class="stage-box">
         <div class="title">
           <div class="title-text">第{{ item.chinaNumIndex }}阶段</div>
-          <img src="../../../../assets/imgs/icon/icon_edit.png" @click="handleEdit(item)">
+          <img src="../../../../assets/imgs/icon/icon_edit.png" @click="handleEdit(item)" v-if="!(item.proof && item.proof !== '')">
         </div>
         <a-row>
           <a-col :span="12">
@@ -28,6 +28,16 @@
             </div>
           </a-col>
         </a-row>
+        <!--        当该阶段有缴费凭证时显示-->
+        <a-row v-if="item.proof && item.proof !== ''">
+          <a-col>
+            <div class="stage">
+              <div class="stage-title">缴费凭证：</div>
+              <div class="stage-content proof-img"><img :src="proofSrc(item.proof)" @click="previewProof(item.proof)">
+              </div>
+            </div>
+          </a-col>
+        </a-row>
         <a-row>
           <a-col>
             <div class="stage">
@@ -46,16 +56,20 @@
     </template>
 
     <arrive-module ref="arriveModal" :project-id="projectId" @ok="addArriveOk" v-bind="$attrs"></arrive-module>
+
+    <!--    缴费凭证预览-->
+    <preview-img-modal ref="previewImg"></preview-img-modal>
   </j-modal>
 </template>
 
 <script>
 import ArriveModule from './ArriveModule'
 import { amountReceivedList } from '../../../../api/incomePaymentsApi'
+import PreviewImgModal from '../../../../components/PreviewImgModal'
 
 export default {
   name: 'ArriveStageModule',
-  components: { ArriveModule },
+  components: { ArriveModule, PreviewImgModal },
   props: {
     // 项目id
     projectId: {
@@ -152,6 +166,22 @@ export default {
       //将【一十】换成【十】
       result = result.replace(/^一十/g, '十')
       return result
+    },
+    /**
+     * 缴费凭证 src
+     */
+    proofSrc(imgId) {
+      return `${ window._CONFIG['domianURL'] }/sys/common/download/${ imgId }`
+    },
+    /**
+     * 预览缴费凭证
+     * @param imgId
+     */
+    previewProof(imgId) {
+      this.$refs.previewImg.title = '缴费凭证'
+      this.$refs.previewImg.imgId = imgId
+      this.$refs.previewImg.visible = true
+      console.log()
     }
   }
 }
@@ -218,5 +248,15 @@ export default {
       white-space: nowrap;
     }
   }
+
+  .proof-img {
+    width: 50%;
+    cursor: pointer;
+
+    img {
+      max-width: 100%;
+      max-height: 200px;
+    }
+  }
 }
 </style>

src/views/financialManagement/arriveAndInvoicing/modules/AuditProofModule.vue

@@ -0,0 +1,244 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    switchFullscreen
+    @ok="handleOk"
+    @cancel="handleCancel"
+    okText="保存"
+    cancelText="关闭">
+    <div class="project-name">{{ model.chargeProject }}</div>
+
+    <a-form :form="form">
+      <h3 class="title">凭证信息</h3>
+      <div>
+        <div class="info-item">
+          <label>缴费金额：</label>
+          <div>{{ proofInfo.amountReceived }}元</div>
+        </div>
+        <div class="info-item">
+          <label>缴费日期：</label>
+          <div>{{ proofInfo.paymentDate }}</div>
+        </div>
+        <div class="info-item">
+          <label>申请人：</label>
+          <div>{{ proofInfo.reviewerName }}</div>
+        </div>
+        <div class="info-item">
+          <label>缴费凭证：</label>
+          <div class="proof-img">
+            <img :src="proofSrc(proofInfo.proof)">
+          </div>
+        </div>
+        <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-textarea
+            placeholder="请输入备注"
+            v-decorator="['remark']"
+            :auto-size="{ minRows: 3, maxRows: 6 }"
+            :maxLength='200'
+            @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+        </a-form-item>
+      </div>
+
+      <h3 class="title">审核</h3>
+      <div>
+        <a-form-item label="审核人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入审核人"
+                   v-decorator="['reviewerName',validatorRules.reviewerName]"
+                   :maxLength='50'
+                   :disabled="true"
+                   @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+        </a-form-item>
+        <a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-radio-group v-decorator="['paymentStatus', validatorRules.paymentStatus]" @change="paymentStatusChange">
+            <a-radio value="completed">同意</a-radio>
+            <a-radio value="rejected">拒绝</a-radio>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="说明" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="showInstructions">
+          <a-textarea
+            placeholder="请输入说明"
+            v-decorator="['reviewInstructions', validatorRules.reviewInstructions]"
+            :auto-size="{ minRows: 3, maxRows: 6 }"
+            :maxLength='200'
+            @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+        </a-form-item>
+      </div>
+    </a-form>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+import { postAction } from '../../../../api/manage'
+import Vue from 'vue'
+import { USER_INFO } from '../../../../store/mutation-types'
+import { getLastProofInfo } from '../../../../api/incomePaymentsApi'
+
+export default {
+  name: 'AuditProofModule',
+  data() {
+    return {
+      title: '来款信息',
+      width: 600,
+      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: {
+        reviewerName: {
+          rules: [{ required: true, message: '请输入审核人' }],
+          validateTrigger: 'blur'
+        },
+        paymentStatus: {
+          rules: [{ required: true, message: '请选择审核状态' }],
+          validateTrigger: 'blur'
+        },
+        reviewInstructions: {
+          rules: [{ required: true, message: '请输入说明' }],
+          validateTrigger: 'blur'
+        }
+      },
+      // 项目缴费凭证信息
+      proofInfo: {},
+      // 是否显示说明
+      showInstructions: false,
+      auditUrl: '/paymentCheck/payPaymentCheck/check'
+    }
+  },
+  methods: {
+    open(record) {
+      this.getProofInfo(record)
+      this.form.resetFields()
+      let userInfo = Vue.ls.get(USER_INFO)
+      // 默认隐藏说明
+      this.showInstructions = false
+      this.model = Object.assign({}, record)
+      this.model.reviewerName = userInfo.realname
+      this.visible = true
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'reviewerName'))
+      })
+    },
+    /**
+     * 获取项目缴费凭证相关信息
+     * @param record
+     */
+    getProofInfo(record) {
+      if (record && record.id) {
+        getLastProofInfo({ projectId: record.id }).then(res => {
+          if (res.success) {
+            this.proofInfo = res.result
+          }
+        })
+      }
+    },
+    handleOk() {
+      if (this.confirmLoading) {
+        return
+      }
+      this.confirmLoading = true
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          values.projectId = this.model.id
+          values.projectType = this.model.projectType
+          const formData = Object.assign(this.proofInfo, values)
+          delete formData.id
+          postAction(this.auditUrl, formData).then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warn(res.message)
+            }
+          }).finally(() => {
+            setTimeout(() => {
+              this.confirmLoading = false
+            }, 1000)
+          })
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+    close() {
+      this.visible = false
+    },
+    /**
+     * 审核通过拒绝变化
+     * @param value
+     */
+    paymentStatusChange(e) {
+      if (e.target.value === 'rejected') {
+        this.showInstructions = true
+      } else {
+        this.showInstructions = false
+      }
+    },
+    /**
+     * 缴费凭证 src
+     */
+    proofSrc(imgId) {
+      return `${ window._CONFIG['domianURL'] }/sys/common/download/${ imgId }`
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+.project-name {
+  font-size: 16px;
+  font-weight: 700;
+  padding-bottom: 20px;
+}
+
+h3 {
+  position: relative;
+}
+
+h3.title::before {
+  position: absolute;
+  top: 4px;
+  left: -10px;
+  content: "";
+  height: 20px;
+  width: 2px;
+  background: #069f99;
+}
+
+.info-item {
+  display: flex;
+  padding: 5px 0;
+
+  label {
+    color: #666666;
+    flex-shrink: 0;
+  }
+
+  div {
+    color: black;
+  }
+
+  .proof-img {
+    width: calc(100% - 6rem);
+
+    img {
+      max-width: 100%;
+    }
+  }
+}
+</style>

src/views/incomePayments/memberManage/councilMaintenance/modules/CouncilMaintenanceMemberModal.vue

@@ -23,6 +23,8 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="企业名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <company-select placeholder="请选择企业"
+                              :can-add="false"
+                              :member-nature="2"
                               v-decorator="['company',validatorRules.company]"
                               @change="companyChange">
               </company-select>