[update] 会员管理-标协会员单位信息的项目信息弹框为公用，增加会员权益面板是否显示的判断；会员管理-单位信息为新增的税额和未税金额计算引入混入

src/components/ProjectDetailModal.vue

@@ -86,8 +86,8 @@
     </section>
     <!-- 基本信息end-->
 
-    <!-- 会员权益begin -->
+    <!-- 标协会员的会员基本信息，会员权益begin -->
-    <section class="enterprise-info">
+    <section class="enterprise-info" v-if="projectType === ProjectTypeEnums.STANDARD_MEMBER_PRO.value">
       <h3 class="title">会员权益</h3>
       <a-row :gutter="24">
         <a-col :span="12" class="detail-item">

src/views/incomePayments/memberManage/SafeguardStardsMemberList.vue

@@ -190,7 +190,7 @@
         </span>
       </a-table>
     </div>
-    <project-detail-modal ref="projectDetail"></project-detail-modal>
+    <project-detail-modal ref="projectDetail" :projectType="ProjectTypeEnums.STANDARD_MEMBER_PRO.value"></project-detail-modal>
     <!--  标协会员单位信息新增、编辑弹框  -->
     <safeguard-stards-member-modal ref="modalForm" @ok="modalFormOk" :base-info="stardsMemberDetail"></safeguard-stards-member-modal>
     <!--  编辑会员权益弹框  -->
@@ -214,6 +214,7 @@ import SafeguardStardsMemberModal from './modules/SafeguardStardsMemberModal'
 import { getStardsMemberProjectById, memberDrawTicket } from '@/api/incomePaymentsApi'
 import MemberEquityModal from './modules/MemberEquityModal'
 import MemberCopyModal from './modules/MemberCopyModal'
+import { ProjectTypeEnums } from '@/enums/commonEnums'
 
 export default {
   name: 'SafeguardStardsMemberList',
@@ -229,6 +230,7 @@ export default {
   },
   data() {
     return {
+      ProjectTypeEnums,
       detailTitleList: [
         {
           title: '标协会员项目',

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

@@ -41,10 +41,7 @@
                 :init-contacts="selectPerson"
                 placeholder="请选择企业联系人"
                 @change="changetPerson"
-                v-decorator="[
+                v-decorator="['companyContactId',validatorRules.companyContactId,]"
-                  'companyContactId',
-                  validatorRules.companyContactId,
-                ]"
                 :maxLength="50"
                 ref="selectContacts"
                 @ok="addContactsOk"
@@ -80,10 +77,7 @@
                 placeholder="请输入待确收金额"
                 :maxLength="50"
                 @change="changeReceivableAmount"
-                v-decorator="[
+                v-decorator="['amountReceivable',validatorRules.amountReceivable,]"
-                  'amountReceivable',
-                  validatorRules.amountReceivable,
-                ]"
                 @blur="addZero"
               ></a-input>
               <span class="yuan">元</span>
@@ -91,8 +85,12 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="税率" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag @change="changeRate" placeholder="请选择税率" dict-code="rate" :trigger-change="true"
+              <j-dict-select-tag @change="changeRate"
-                                 v-decorator="['taxRate',validatorRules.taxRate]"></j-dict-select-tag>
+                                 placeholder="请选择税率"
+                                 dict-code="rate"
+                                 :trigger-change="true"
+                                 v-decorator="['taxRate',validatorRules.taxRate]"
+              ></j-dict-select-tag>
             </a-form-item>
           </a-col>
         </a-row>
@@ -107,7 +105,8 @@
                            @blur="addZero"
                            read-only
                            disabled
-                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"
+                  ></a-input>
                 </a-col>
                 <a-col :span="1">元</a-col>
               </a-row>
@@ -124,7 +123,8 @@
                            disabled
                            @blur="addZero"
                            read-only
-                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"></a-input>
+                           @change="(e) => {e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()}"
+                  ></a-input>
                 </a-col>
                 <a-col :span="1">元</a-col>
               </a-row>
@@ -214,11 +214,7 @@
                 placeholder="请输入收费通知号"
                 :maxLength="50"
                 v-decorator="['chargeNoticeNo', validatorRules.chargeNoticeNo]"
-                @change="
+                @change="(e) => {e.target.value = (e.target.value + '').trim()}"
-                  (e) => {
-                    e.target.value = (e.target.value + '').trim();
-                  }
-                "
               ></a-input>
             </a-form-item>
           </a-col>
@@ -252,11 +248,7 @@
                 :auto-size="{ minRows: 3, maxRows: 6 }"
                 :maxLength="200"
                 v-decorator="['remark']"
-                @change="
+                @change="(e) => {e.target.value = (e.target.value + '').trim()}"
-                  (e) => {
-                    e.target.value = (e.target.value + '').trim();
-                  }
-                "
               />
             </a-form-item>
           </a-col>
@@ -283,7 +275,7 @@ import { money } from '@/utils/validate'
 import { checkAssociatedProject } from '@/utils/projectCheck'
 import SelectRevenueContract from '../../../../components/tools/SelectRevenueContract'
 import JDictSelectTag from '@comp/dict/JDictSelectTag'
-import {CalcAmountMixin} from '@/mixins/CalcAmountMixin'
+import { CalcAmountMixin } from '@/mixins/CalcAmountMixin'
 import JDate from '@/components/tools/JDate'
 
 export default {

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

@@ -69,7 +69,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row>
+        <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
             <a-form-item
               label="会员性质"
@@ -93,17 +93,18 @@
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
             >
-              <a-input
+              <a-row :gutter="10">
-                placeholder="请输入待确收金额"
+                <a-col :span="20">
-                :maxLength="50"
+                  <a-input
-                @change="changeReceivableAmount"
+                    placeholder="请输入待确收金额"
-                v-decorator="[
+                    :maxLength="50"
-                  'amountReceivable',
+                    @change="changeReceivableAmount"
-                  validatorRules.amountReceivable,
+                    v-decorator="['amountReceivable',validatorRules.amountReceivable]"
-                ]"
+                    @blur="addZero"
-                @blur="addZero"
+                  ></a-input>
-              ></a-input>
+                </a-col>
-              <span class="yuan">元</span>
+                <a-col :span="1">元</a-col>
+              </a-row>
             </a-form-item>
           </a-col>
           <a-col :xl="12" :sm="24">
@@ -113,7 +114,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row>
+        <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
             <a-form-item label="税额" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-row :gutter="10">
@@ -148,7 +149,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row>
+        <a-row :gutter="24">
           <a-col :xl="12" :sm="24">
             <a-form-item label="预估到账日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-date placeholder="请选择预估到账日期"
@@ -231,15 +232,11 @@
                 placeholder="请输入收费通知号"
                 :maxLength="50"
                 v-decorator="['chargeNoticeNo', validatorRules.chargeNoticeNo]"
-                @change="
+                @change="(e) => {e.target.value = (e.target.value + '').trim()}"
-                  (e) => {
-                    e.target.value = (e.target.value + '').trim();
-                  }
-                "
               ></a-input>
             </a-form-item>
           </a-col>
-          <a-col :span="12">
+          <a-col :xl="12" :sm="24">
             <a-form-item
               label="收费通知"
               :labelCol="labelCol"
@@ -257,7 +254,7 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row>
+        <a-row :gutter="24">
           <a-col>
             <a-form-item
               label="备注"
@@ -269,11 +266,7 @@
                 :auto-size="{ minRows: 3, maxRows: 6 }"
                 :maxLength="200"
                 v-decorator="['remark']"
-                @change="
+                @change="(e) => {e.target.value = (e.target.value + '').trim()}"
-                  (e) => {
-                    e.target.value = (e.target.value + '').trim();
-                  }
-                "
               />
             </a-form-item>
           </a-col>
@@ -296,9 +289,11 @@ import { money } from '@/utils/validate'
 import { httpAction } from '@/api/manage'
 import { MemberNature, IncomeMethod } from '@/enums/commonEnums'
 import {checkAssociatedProject} from '@/utils/projectCheck'
+import { CalcAmountMixin } from '@/mixins/CalcAmountMixin'
 
 export default {
   name: 'SafeguardStardsMemberModal',
+  mixins: [CalcAmountMixin],
   components: {
     JUpload,
     JDate,
@@ -392,6 +387,7 @@ export default {
           validateTrigger: 'change'
         }
       },
+      ysjeKey: 'amountReceivable',
       // 来款方式
       incomePaysType: 3,
       // 选中的会员单位