[update] 工作组成员--企业联系人验重

src/views/businessManagement/modules/BusinessManagementModule.vue

@@ -207,6 +207,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           values.dataSource = this.dataForm
           values.signingUp = this.applyAdd
           let httpurl = ''

src/views/businessManagement/modules/ContactManagementModule.vue

@@ -8,6 +8,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
           <a-col :xl="12" :sm="24">
@@ -94,6 +95,7 @@
           </a-col>
         </a-row>
       </a-form>
+    </a-spin>
   </j-modal>
 </template>
 
@@ -103,7 +105,7 @@ import { httpAction } from '@api/manage'
 import CompanySelect from '@comp/company/CompanySelect'
 import { postcode, phoneReg, isEmail } from '@/utils/validate'
 import { duplicateCheck } from '@api/api'
-import { queryContactByName } from "../../../api/incomePaymentsApi"
+import { queryContactByName } from '../../../api/incomePaymentsApi'
 
 export default {
   name: 'ContactManagementModule',
@@ -190,7 +192,7 @@ export default {
           validateTrigger: 'blur'
         }
       },
-      selectedCompanyId: null, // 当前选择企业的id
+      selectedCompanyId: null // 当前选择企业的id
     }
   },
   methods: {
@@ -228,6 +230,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           // 处理企业名称和id等信息
           values.companyName = values.company.companyName
           values.companyId = values.company.id

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -8,6 +8,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row>
           <a-col>
@@ -107,7 +108,8 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <span v-if="defaultChargeWay === 2 && chargeWayType === 2">合同</span>
-            <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange" v-else>
+              <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange"
+                             v-else>
                 <a-radio :value="1">无</a-radio>
                 <a-radio :value="2">合同</a-radio>
                 <a-radio :value="3">收费通知</a-radio>
@@ -157,6 +159,7 @@
           </a-col>
         </a-row>
       </a-form>
+    </a-spin>
   </j-modal>
 </template>
 
@@ -192,7 +195,7 @@ export default {
       type: Number,
       required: false,
       default: null
-    },
+    }
   },
   data() {
     return {
@@ -327,6 +330,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           values.chargeCompanyName = values.chargeCompany.companyName
           values.chargeCompanyId = values.chargeCompany.id
           // 收入合同新建项目手动赋值

src/views/projectManagement/modules/WorkingGroupMemberSetChargeNotice.vue

@@ -8,6 +8,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-form-item label="收费通知号" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
           <a-radio-group v-decorator="['chargeNoticeNo']" @change="handleChargeNoticeChange"
@@ -56,6 +57,7 @@
           </a-col>
         </a-row>
       </a-form>
+    </a-spin>
   </j-modal>
 </template>
 
@@ -107,10 +109,10 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          this.confirmLoading = true
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
           formData.ids = this.selectedRowKeys.join(',')
-
           postAction(this.url.setCharge, formData).then(res => {
             if (res.success) {
               this.$message.success(res.message)

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -8,6 +8,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
       <a-form :form="form">
         <a-row v-if="defaultChargeWay">
           <a-col>
@@ -15,7 +16,9 @@
               <a-select placeholder="请选择工作组项目"
                         v-decorator="['workingGroupId',validatorRules.workingGroupId]"
                         :maxLength='50'>
-              <a-select-option v-for="item in workingGroupList" :key="item.id" :value="item.id">{{ item.workingGroupProject }}</a-select-option>
+                <a-select-option v-for="item in workingGroupList" :key="item.id" :value="item.id">
+                  {{ item.workingGroupProject }}
+                </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -49,7 +52,7 @@
               <select-contacts :selected-company="selectedCompany"
                                :init-contacts="selectedContact2"
                                placeholder="请选择企业联系人2"
-                             v-decorator="['contactsIdTwo']"
+                               v-decorator="['contactsIdTwo',validatorRules.contactsRepeat]"
                                :maxLength='50'
                                ref="selectContacts2"
                                @ok="addContactsTwoOk"></select-contacts>
@@ -62,7 +65,7 @@
               <select-contacts :selected-company="selectedCompany"
                                :init-contacts="selectedContact3"
                                placeholder="请选择企业联系人3"
-                             v-decorator="['contactsIdThree']"
+                               v-decorator="['contactsIdThree',validatorRules.contactsRepeat]"
                                :maxLength='50'
                                ref="selectContacts3"
                                @ok="addContactsThreeOk"></select-contacts>
@@ -84,7 +87,8 @@
           <a-col :xl="12" :sm="24">
             <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <span v-if="defaultChargeWay === 2">合同</span>
-            <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange" v-else>
+              <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange"
+                             v-else>
                 <a-radio :value="1">无</a-radio>
                 <a-radio :value="2">合同</a-radio>
                 <a-radio :value="3">收费通知</a-radio>
@@ -188,6 +192,7 @@
           </a-col>
         </a-row>
       </a-form>
+    </a-spin>
   </j-modal>
 </template>
 
@@ -198,6 +203,7 @@ import JUpload from '@comp/jero/JUpload'
 import CompanySelect from '@comp/company/CompanySelect'
 import SelectContacts from '@comp/company/SelectContacts'
 import { getWorkingGroupListByNotCompany } from '../../../api/incomePaymentsApi'
+import { isRepeat } from '../../../utils/util'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
@@ -254,13 +260,17 @@ export default {
           validateTrigger: 'change'
         },
         chargeCompany: {
-          rules: [{ required: true, message: '请选择成员单位' }],
+          rules: [{ required: true, validator: this.checkCompany }],
           validateTrigger: 'change'
         },
         contactsIdOne: {
           rules: [{ required: true, message: '请选择企业联系人1' }],
           validateTrigger: 'blur'
         },
+        contactsRepeat: {
+          rules: [{ required: false, validator: this.validateContact }],
+          validateTrigger: 'blur'
+        },
         mailContactsId: {
           rules: [{ required: true, message: '请选择邮寄联系人' }],
           validateTrigger: 'blur'
@@ -379,6 +389,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           // 收入合同新建项目手动赋值
           if (this.defaultChargeWay === 2) {
             values.chargeWay = 2
@@ -486,7 +497,7 @@ export default {
         callback()
         return
       }
-      callback('请选择企业')
+      callback('请选择成员单位')
     },
     /**
      * 在新增成功后重新获取联系人列表
@@ -510,6 +521,24 @@ export default {
       this.$refs.selectContacts1.getContactsList()
       this.$refs.selectContacts2.getContactsList()
       this.$refs.selectContacts3.getContactsList()
+    },
+    /**
+     * 校验企业联系人是否重复
+     * @param rule
+     * @param value
+     * @param callback
+     */
+    validateContact(rule, value, callback) {
+      const contactObj = this.form.getFieldsValue(['contactsIdOne', 'contactsIdTwo', 'contactsIdThree'])
+      const contactArr = Object.values(contactObj)
+      contactArr.filter(tt => tt !== undefined)
+      console.log(contactArr)
+      if (isRepeat(contactArr)) {
+        callback('请选择不同的企业联系人')
+      } else {
+        callback()
+      }
+      callback()
     }
   }
 }

src/views/projectManagement/modules/WorkingGroupProjectModule.vue

@@ -8,6 +8,7 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
+    <a-spin :spinning="confirmLoading">
     <span class="prompt-message">
       说明：1.负责人A为该工作组的主负责人，负责人B为该工作组的辅助负责人。<br>
       <span class="prompt-message-line2">2.设置本年应收款A和本年应收款B是为了区分工作组成员的价格。</span>
@@ -164,6 +165,7 @@
           </a-col>
         </a-row>
       </a-form>
+    </a-spin>
   </j-modal>
 </template>
 
@@ -242,6 +244,7 @@ export default {
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
+          that.confirmLoading = true
           let httpurl = ''
           let method = 'post'
           if (!this.model.id) {