Merge branch 'branch20211008' of http://10.10.10.43:9090/income_payments/income_payments_client into xuqiubangeng1026

src/api/incomeMeetingApi.js

@@ -14,11 +14,15 @@ const createQcCode = (params) => getAction('/meeting/payMeeting/createBase64',pa
 // 收入合同的新增会员项目的查询
 const queryContractMemberProject = (params) => getAction('/jero/memberProject/queryListByNotCompany',params)
 
+// 通过单位名称校验是否标协会员
+const validateStandard = (params) => getAction('/meeting/internalMeetingSituation/checkMember',params)
+
 export {
   getUserInfo,
   getMeetInfoById,
   getAllWorkProjects,
   getSingUpUserInfo,
   createQcCode,
-  queryContractMemberProject
+  queryContractMemberProject,
+  validateStandard
 }

src/components/ProjectDetailModal.vue

@@ -16,7 +16,7 @@
         </a-col>
         <a-col :span="12" class="detail-item">
           <label>应收金额：</label>
-          <span><j-ellipsis :value="`${basicInfo.receivableAmount}元`" :length="20"></j-ellipsis></span>
+          <span><j-ellipsis :value="`${basicInfo.receivableAmount ? basicInfo.receivableAmount : '0.00'}元`" :length="20"></j-ellipsis></span>
         </a-col>
       </a-row>
       <a-row :gutter="24">

src/utils/validateOnly.js

@@ -3,8 +3,8 @@ import {phoneReg, isEmail, chineseReg} from '@/utils/validate'
 
 // 手机校验的错误信息提示
 const phoneErrMsg = {
-  err1: '请输入手机号码',
+  err1: '请输入手机号',
-  err2: '请输入正确格式的手机号码'
+  err2: '请输入正确格式的手机号'
 }
 // 邮箱校验错误提示信息
 const emailErrMsg = {

src/views/incomePayments/meetManage/Attendance.vue

@@ -634,6 +634,7 @@ export default {
     *  审核
     * */
     handleAudit(record) {
+      this.$refs.auditModal.title = '审核凭证'
       this.$refs.auditModal.open(record, false)
     },
     /*

src/views/incomePayments/meetManage/modules/AuditModal.vue

@@ -1,77 +1,79 @@
 <template>
   <j-modal
-      :title="title"
+    :title="title"
-      :width="width"
+    :width="width"
-      :visible="visible"
+    :visible="visible"
-      :confirmLoading="confirmLoading"
+    :confirmLoading="confirmLoading"
-      @ok="handleOk"
+    @ok="handleOk"
-      @cancel="handleCancel"
+    @cancel="handleCancel"
-      cancelText="关闭">
+    cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <section class="check">
         <h3>报名信息</h3>
         <a-row :gutter="24">
           <a-col :span="24">
             <label>参会企业：</label>
-            <span>{{model.companyName}}</span>
+            <span>{{ model.companyName }}</span>
           </a-col>
         </a-row>
 
         <a-row :gutter="24">
           <a-col :span="12">
             <label>姓名：</label>
-            <span>{{model.companyContactName}}</span></a-col>
+            <span>{{ model.companyContactName }}</span></a-col>
           <a-col :span="12">
             <label>手机号：</label>
-            <span>{{model.phone}}</span></a-col>
+            <span>{{ model.phone }}</span></a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <label>身份：</label>
-            <span>{{model.identity_dictText}}</span></a-col>
+            <span>{{ model.identity_dictText }}</span></a-col>
           <a-col :span="12" v-show="checkSignBool">
             <label>是否住酒店：</label>
-            <span>{{model.checkInHotel_dictText}}</span></a-col>
+            <span>{{ model.checkInHotel_dictText }}</span></a-col>
         </a-row>
         <a-row :gutter="24" v-show="checkSignBool">
           <a-col :span="12">
             <label>抵达时间：</label>
-            <span>{{model.arrivalTime}}</span></a-col>
+            <span>{{ model.arrivalTime }}</span></a-col>
           <a-col :span="12">
             <label>离开时间：</label>
-            <span>{{model.departureTime}}</span></a-col>
+            <span>{{ model.departureTime }}</span></a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
             <label>缴费方式：</label>
-            <span>{{model.payMode_dictText}}</span></a-col>
+            <span>{{ model.payMode_dictText }}</span></a-col>
           <a-col :span="12">
             <label>需要发票：</label>
-            <span>{{model.needInvoice_dictText}}</span></a-col>
+            <span>{{ model.needInvoice_dictText }}</span></a-col>
         </a-row>
       </section>
-      <a-row :gutter="24" style="margin-top: 10px">
+      <!-- 审核报名信息不显示 -->
-       <a-col :span="3">
+      <a-row :gutter="24" style="margin-top: 10px" v-show="!checkSignBool">
-         <label class="color-999">缴费凭证：</label>
+        <a-col :span="3">
-       </a-col>
+          <label class="color-999">缴费凭证：</label>
+        </a-col>
         <a-col :span="9">
           <j-image-upload disabled :return-id="true" v-model="model.paymentRecord"></j-image-upload>
         </a-col>
-<!--        缴费上方式为线上的 显示 -->
+        <!--        缴费上方式为线上的 显示 -->
         <a-col :span="12" v-if="model.payMode === 2 ">
           <label class="color-999">订单后四位：</label>
-          <span class="color-black">{{model.orderCode}}</span></a-col>
+          <span class="color-black">{{ model.orderCode }}</span></a-col>
       </a-row>
 
       <h3>审核</h3>
 
       <a-form :form="form">
         <a-row :gutter="24">
-          <a-col :xl="12" :sm="24" >
+          <a-col :xl="12" :sm="24">
             <a-form-item label="审核" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果" @change="changeCheck">
+              <a-radio-group v-decorator="['checkResult',validatorRules.checkResult]" placeholder="请选择审核结果"
+                             @change="changeCheck">
                 <a-radio value="1">
-                 通过
+                  通过
                 </a-radio>
                 <a-radio value='2'>
                   驳回
@@ -82,11 +84,11 @@
           <a-col :xl="24" :sm="24" v-if="checkBool">
             <a-form-item label="审核说明" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
               <a-textarea
-                  placeholder="请输入审核说明"
+                placeholder="请输入审核说明"
-                  :auto-size="{ minRows: 3, maxRows: 6 }"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
-                  :maxLength='200'
+                :maxLength='200'
-                  v-decorator="['checkRemark',validatorRules.checkRemark]"
+                v-decorator="['checkRemark',validatorRules.checkRemark]"
-                  @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
             </a-form-item>
           </a-col>
           <a-col :xl="24" :sm="24" v-if="!checkBool">
@@ -157,53 +159,53 @@ export default {
         // 审核凭证
         check: '/meeting/payMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/payMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/payMeetingSituation/checkRegister'
       },
       // 其他会议url
       otherMeetingUrl: {
         // 审核凭证
         check: '/meeting/ohterMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/ohterMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/ohterMeetingSituation/checkRegister'
       },
       // 工作组会议url
       workGroupMeetingUrl: {
         // 审核凭证
         check: '/meeting/workGroupMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/workGroupMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/workGroupMeetingSituation/checkRegister'
       },
       // 分标委会议url
       committeeMeetingUrl: {
         // 审核凭证
         check: '/meeting/committeeMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/committeeMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/committeeMeetingSituation/checkRegister'
       },
       // 国际研讨会url
       internalMeetingUrl: {
         // 审核凭证
         check: '/meeting/internalMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/internalMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/internalMeetingSituation/checkRegister'
       },
       // 标协会议url
       standardsMeetingUrl: {
         // 审核凭证
         check: '/meeting/standardsMeetingSituation/check',
         // 审核报名信息
-        checkSignUp:'/meeting/standardsMeetingSituation/checkRegister'
+        checkSignUp: '/meeting/standardsMeetingSituation/checkRegister'
       },
       // 审核结果选择
-      checkBool:false,
+      checkBool: false,
       // 是否是审核报名信息
-      checkSignBool:false,
+      checkSignBool: false,
       // 参会人id
-      signUpPersonId:'',
+      signUpPersonId: '',
     }
   },
   methods: {
-    open(record,signUp) {
+    open(record, signUp) {
       this.form.resetFields()
       this.visible = true
       this.signUpPersonId = record.id
@@ -211,7 +213,7 @@ export default {
       // 控制行程信息显示 审核凭证不显示
       this.checkSignBool = signUp || false
       // 会议类型不同 url不同
-      this.url = Object.assign({},this.createUrlByMeetingType(this.$route.query.meetingType))
+      this.url = Object.assign({}, this.createUrlByMeetingType(this.$route.query.meetingType))
       console.log(record)
     },
     close() {
@@ -225,10 +227,10 @@ export default {
         if (!err) {
           that.confirmLoading = true
           let httpurl = ''
-          if(that.checkSignBool){
+          if (that.checkSignBool) {
             // 审核报名信息的接口
-           httpurl = this.url.checkSignUp
+            httpurl = this.url.checkSignUp
-          }else {
+          } else {
             // 审核凭证的接口
             httpurl = this.url.check
           }
@@ -250,9 +252,9 @@ export default {
         }
       })
     },
-    querySingUpUserInfo(){
+    querySingUpUserInfo() {
-      getSingUpUserInfo({id:this.signUpPersonId}).then(res => {
+      getSingUpUserInfo({id: this.signUpPersonId}).then(res => {
-        if(res.success){
+        if (res.success) {
           this.model = res.result
         }
       })
@@ -263,25 +265,30 @@ export default {
     /*
     * 选择审核结果
     * */
-    changeCheck(e){
+    changeCheck(e) {
       console.log(e)
       // 审核结果选择拒绝 审核说明必填
-      if(e.target.value === '1'){
+      if (e.target.value === '1') {
         this.checkBool = false
-      }else if(e.target.value === '2'){
+      } else if (e.target.value === '2') {
         this.checkBool = true
       }
     },
     /*
     * 根据会议类型不同的url
     * */
-    createUrlByMeetingType(meetingType){
+    createUrlByMeetingType(meetingType) {
-      switch (meetingType){
+      switch (meetingType) {
-        case '1': return this.workGroupMeetingUrl
+        case '1':
-        case '2': return this.standardsMeetingUrl
+          return this.workGroupMeetingUrl
-        case '3': return this.internalMeetingUrl
+        case '2':
-        case '4': return this.otherMeetingUrl
+          return this.standardsMeetingUrl
-        case '5': return this.committeeMeetingUrl
+        case '3':
+          return this.internalMeetingUrl
+        case '4':
+          return this.otherMeetingUrl
+        case '5':
+          return this.committeeMeetingUrl
       }
     }
   }
@@ -316,7 +323,8 @@ export default {
 .color-999 {
   color: #999;
 }
+
 .color-black {
-  color:black;
+  color: black;
 }
 </style>

src/views/mailManagement/BillMail.vue

@@ -161,7 +161,9 @@ export default {
           align: 'center',
           width: 200,
           dataIndex: 'invoiceAmount',
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.invoiceAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         },
         {
           title: '项目负责人',

src/views/mailManagement/ContractMail.vue

@@ -9,12 +9,12 @@
           <a-row :gutter="24">
             <a-col :xl="5" :lg="8" :md="8" :sm="24">
               <a-form-item label="合同编号">
-                <a-input placeholder="请输入来款项目" v-model="queryParam.contractNum" :maxLength='50'></a-input>
+                <a-input placeholder="请输入合同编号" v-model="queryParam.contractNum" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="8" :md="8" :sm="24">
               <a-form-item label="合同名称">
-                <a-input placeholder="请输入来款单位" v-model="queryParam.contractName" :maxLength='50'></a-input>
+                <a-input placeholder="请输入合同名称" v-model="queryParam.contractName" :maxLength='50'></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="5" :lg="12" :md="16" :sm="24">
@@ -126,56 +126,58 @@ export default {
           align: 'center',
           width: 300,
           dataIndex: 'contractNum',
-          scopedSlots: { customRender: 'htmlSlot' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '合同名称',
           align: 'center',
           width: 300,
           dataIndex: 'contractName',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '签订单位',
           align: 'center',
           width: 300,
           dataIndex: 'signedCompanyTemporaryName',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '负责人',
           align: 'center',
           width: 300,
           dataIndex: 'principalName',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '合同总金额',
           align: 'center',
           width: 200,
           dataIndex: 'contractAmount',
-          scopedSlots: { customRender: 'projectName' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.contractAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         },
         {
           title: '邮寄联系人',
           align: 'center',
           width: 300,
           dataIndex: 'liaisonMan',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '联系人电话',
           align: 'center',
           width: 200,
           dataIndex: 'mobile',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '状态',
           align: 'center',
           width: 200,
           dataIndex: 'postStatus_dictText',
-          scopedSlots: { customRender: 'projectName' }
+          scopedSlots: { customRender: 'text' }
         },
         {
           title: '打印',

src/views/projectManagement/GeneralProjectManagement.vue

@@ -181,7 +181,8 @@ export default {
           width: 150,
           dataIndex: 'receivableAmount',
           customRender: (text, record) => (
-            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>)
+            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         }, {
           title: '实收金额',
           align: 'center',

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -282,13 +282,17 @@ export default {
           align: 'center',
           dataIndex: 'receivableAmount',
           width: 180,
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.receivableAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         }, {
           title: '实收金额',
           align: 'center',
           dataIndex: 'paidAmount',
           width: 180,
-          scopedSlots: { customRender: 'text' }
+          customRender: (text, record) => (
+            <j-ellipsis value={ record.paidAmount + '元' } length={ 15 }></j-ellipsis>
+          )
         }, {
           title: '打包',
           align: 'center',
@@ -536,7 +540,6 @@ export default {
 
     &-filename {
       cursor: pointer;
-      color: #069f99;
     }
   }
 }

src/views/signUp/SignUpPage.vue

@@ -223,7 +223,7 @@
 </template>
 
 <script>
-import {getMeetInfoById} from '@api/incomeMeetingApi'
+import {getMeetInfoById,validateStandard} from '@api/incomeMeetingApi'
 import SelectContacts from '@comp/company/SelectContacts'
 import OtherMeetingForm from '@views/incomePayments/meetManage/OtherMeetingForm'
 import SeminarVipForm from '@views/incomePayments/meetManage/modules/SeminarVipForm'
@@ -331,6 +331,8 @@ export default {
       isPackBool: false,
       // 国际研讨会身份的控制
       identityBool: false,
+      // 是否是标协成员
+      isStandardBool:false,
       // url是否有id字段  默认没有
       urlHaveIdBool: false,
       url: {
@@ -529,7 +531,18 @@ export default {
     * 选择参会企业
     * */
     changeCompany(value) {
+
       this.selectedCompany = value
+      // 通过企业名称判断当前参会人
+      if(this.currentMeetingInfo.meetingType +'' === '2' ){
+        console.log('标协会议')
+        validateStandard({companyName:this.selectedCompany.companyName}).then(res => {
+          this.isStandardBool = res.result
+          if(this.isStandardBool){
+            this.meetingCostSum = this.currentMeetingInfo.meetingCostsVip
+          }
+        })
+      }
       // 选择企业清空 姓名 手机号
       this.form.resetFields(['companyContactId', 'phone'])
 

src/views/statisticalReport/departmentStatistics/ProjectPaymentStatisticsList.vue

@@ -7,27 +7,27 @@
       <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-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input placeholder="请输入来款单位" v-model="queryParam.chargeCompanyTemporaryName" :maxLength="50"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :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">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款用途" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-dict-select-tag v-model="queryParam.chargeUse" placeholder="请选择来款用途" dictCode="payment_charge_use"/>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="来款年份" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <j-year-date style="width:100%" placeholder="请选择来款年份" v-model="queryParam.year"></j-year-date>
               </a-form-item>
             </a-col>
-            <a-col :xl="10" :lg="11" :md="12" :sm="24">
+            <a-col :xxl="6" :xl="12" :lg="12" :md="12" :sm="24">
               <a-form-item label="应收款项" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input
                   placeholder="请输入应收款项"
@@ -42,12 +42,12 @@
                   @change="checkMoney('end')"></a-input>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="项目负责人" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-principal placeholder="请选择项目负责人" v-model="queryParam.principalNameId"></select-principal>
               </a-form-item>
             </a-col>
-            <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-col :xxl="4" :xl="8" :lg="8" :md="8" :sm="24">
               <a-form-item label="所属科室" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-tree-select
                   style="width:100%"

src/views/system/DictItemList.vue

@@ -43,7 +43,7 @@
             </a-row>
             <a-row>
               <a-col :md="2" :sm="24">
-                <a-button style="margin-bottom: 10px" type="primary" @click="handleAdd" v-has="'dic:item:add'">新增</a-button>
+                <a-button style="margin-bottom: 10px" type="primary" @click="handleAdd" v-has="'dic:item:add'" icon="plus">新增</a-button>
               </a-col>
             </a-row>
           </a-form>

src/views/system/UserList.vue

@@ -181,7 +181,7 @@ export default {
         //   scopedSlots: { customRender: "text" },
         // },
         {
-          title: '手机号',
+          title: '手机号码',
           align: 'center',
           width: 160,
           dataIndex: 'phone',

src/views/system/modules/UserModal.vue

@@ -155,8 +155,8 @@
                             v-decorator="[ 'emailPassword', validatorRules.emailPassword]" :maxLength="50"/>
         </a-form-item>
 
-        <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入手机号码" @change="event => event.target.value = event.target.value.trim()"
+          <a-input placeholder="请输入手机号" @change="event => event.target.value = event.target.value.trim()"
                    :disabled="isDisabledAuth('user:form:phone') || disableSubmit"
                    v-decorator="[ 'phone', validatorRules.phone]" :maxLength="11"/>
         </a-form-item>