From 12888fb62cb11a44c4ac7a2556751d76a8c438a1 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 11 Jan 2024 16:22:29 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B5=B7=E8=8D=89=E7=BB=84=E6=8A=A5?=
 =?UTF-8?q?=E5=90=8D=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84=E3=80=81=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=BB=84=E5=92=8C=E8=B5=B7=E8=8D=89=E7=BB=84=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E5=AE=8C=E5=96=84=EF=BC=88=E6=9C=AA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |   8 +-
 src/views/draftTeam/DraftTeam.vue             |  16 +-
 src/views/draftTeam/DraftTeamDetail.vue       |   7 +-
 src/views/draftTeam/SignUpDraftTeamPage.vue   | 298 +++++++++----
 .../draftTeam/modules/DraftTeamModal.vue      | 397 +++++++++++++-----
 src/views/workTeam/modules/WorkTeamModal.vue  | 294 +++++++++----
 6 files changed, 748 insertions(+), 272 deletions(-)

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 1145f7c..acd67b3 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -21,6 +21,8 @@ const getCouncilDetailById = (param) => getAction('/payCaseCouncil/payCaseCounci
 const getCommitteeUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/listForThree', param)
 // 工作组在研项目
 const getWorkingGroupUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/list', param)
+// 起草组在研项目
+const getDraftingGroupUnderStudyProject = (param) => getAction('/drafting/payDraftingGroupResearchProject/list', param)
 // 缴费凭证审核记录
 const getAuditProofRecords = (param) => getAction('/paymentCheck/payPaymentCheck/amountReceivedSubList', param)
 // 生成会议二维码
@@ -68,6 +70,8 @@ const updateInvoiceBySignUp = (params) => postAction('/company/payCompanyManagem
 // 国际研讨会-WASIC-通过会议ID获取关联主题的信息
 const getLinkTopics = (params) => getAction('/meeting/internalMeeting/getLinkTopics', params)
 
+// 获取不存在成员单位的工作组信息
+const getWorkingGroupListByNotCompany = (param) => getAction('/project/payWorkingGroup/queryListByNotCompany', param)
 export {
   queryCommonProjectById,
   queryContactInfoByMemberId,
@@ -83,6 +87,7 @@ export {
   getCouncilDetailById,
   getCommitteeUnderStudyProject,
   getWorkingGroupUnderStudyProject,
+  getDraftingGroupUnderStudyProject,
   getAuditProofRecords,
   checkMember,
   createQcCode,
@@ -99,5 +104,6 @@ export {
   upgradeVip,
 
   updateInvoiceBySignUp,
-  getLinkTopics
+  getLinkTopics,
+  getWorkingGroupListByNotCompany
 }
diff --git a/src/views/draftTeam/DraftTeam.vue b/src/views/draftTeam/DraftTeam.vue
index 699f6e2..78c86f9 100644
--- a/src/views/draftTeam/DraftTeam.vue
+++ b/src/views/draftTeam/DraftTeam.vue
@@ -134,13 +134,15 @@ export default {
           dataIndex: 'missionAndObjectives',
           align: 'center',
           scopedSlots: { customRender: 'text' }
-        }, {
-          title: '缴费凭证状态',
-          dataIndex: 'paymentStatus_dictText',
-          align: 'center',
-          width: 120,
-          scopedSlots: { customRender: 'text' }
-        }, {
+        },
+        // {
+        //   title: '缴费凭证状态',
+        //   dataIndex: 'paymentStatus_dictText',
+        //   align: 'center',
+        //   width: 120,
+        //   scopedSlots: { customRender: 'text' }
+        // },
+        {
           title: '操作',
           dataIndex: 'action',
           align: 'center',
diff --git a/src/views/draftTeam/DraftTeamDetail.vue b/src/views/draftTeam/DraftTeamDetail.vue
index ff3ec97..c026e71 100644
--- a/src/views/draftTeam/DraftTeamDetail.vue
+++ b/src/views/draftTeam/DraftTeamDetail.vue
@@ -101,7 +101,10 @@
 <script>
 import MeetingList from '@comp/detailPage/MeetingList'
 import FileList from '@comp/detailPage/FileList'
-import { getWorkingGroupUnderStudyProject, queryCommonProjectById } from '@api/incomePaymentsApi'
+import {
+  getDraftingGroupUnderStudyProject,
+  queryCommonProjectById
+} from '@api/incomePaymentsApi'
 import UnderStudyFilesModal from '@views/MessagePage/modules/UnderStudyFilesModal'
 import PreviewFile from '@comp/jero/PreviewFile'
 import { getFileInfo } from '@api/api'
@@ -214,7 +217,7 @@ export default {
         pageNo: this.ipagination.current,
         pageSize: this.ipagination.pageSize
       }
-      getWorkingGroupUnderStudyProject(param).then(res => {
+      getDraftingGroupUnderStudyProject(param).then(res => {
         if (res.success) {
           this.dataSource = res.result.records
           if (res.result.total) {
diff --git a/src/views/draftTeam/SignUpDraftTeamPage.vue b/src/views/draftTeam/SignUpDraftTeamPage.vue
index e84e98e..e468d89 100644
--- a/src/views/draftTeam/SignUpDraftTeamPage.vue
+++ b/src/views/draftTeam/SignUpDraftTeamPage.vue
@@ -66,40 +66,45 @@
             <div class="item-title">个人信息</div>
             <a-row :gutter="24">
               <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="参会企业" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <company-select @change="changeCompany" v-decorator="['companyId',validatorRules.companyId]"
-                                  placeholder="请选择参会企业"
-                                  :is-limit="true"
-                                  full-company-info
+                <a-form-item label="成员单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <company-select placeholder="请选择成员单位"
+                                  v-decorator="['chargeCompany',validatorRules.chargeCompany]"
+                                  @change="companyChange"
                                   :maxLength='50'>
                   </company-select>
-                  <span class="color-red">若没有您要选择的企业,请您添加企业信息(发票抬头)</span>
-                </a-form-item>
-              </a-col>
-            </a-row>
-            <a-row :gutter="24">
-              <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <select-contacts :selected-company="selectedCompany"
-                                   placeholder="请选择参会人"
-                                   :is-limit="true"
-                                   v-decorator="['companyContactId',validatorRules.companyContactId]"
-                                   :maxLength='50'
-                                   @change="changeContact"
-                                   ref="selectMailContacts"
-                                   @ok="addContactsOk"></select-contacts>
-                </a-form-item>
-              </a-col>
-              <a-col :xxl="8" :xl="12" :sm="24">
-                <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入手机号"
-                           @change="(e) => {e.target.value = e.target.value.replace(/[^0-9]/g,'')}"
-                           :maxLength='11'
-                           disabled
-                           v-decorator="['phone',validatorRules.phone]"></a-input>
                 </a-form-item>
               </a-col>
             </a-row>
+            <template
+              v-if="model.payDraftingGroupSubItemContactsList && model.payDraftingGroupSubItemContactsList.length > 0">
+              <a-row :gutter="24" v-for="(item, index) in model.payDraftingGroupSubItemContactsList" :key="index + ''">
+                <a-col :xxl="8" :xl="12" :sm="24">
+                  <a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <select-contacts :selected-company="selectedCompany"
+                                     :init-contacts="model.payDraftingGroupSubItemContactsList[index]"
+                                     :placeholder="`请选择企业联系人${index + 1}`"
+                                     v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
+                                     :maxLength='50'
+                                     :ref="`selectContacts${index}`"></select-contacts>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="6" :xl="8" :sm="24">
+                  <!--            v-show="hasContactOne"-->
+                  <a-form-item :label="`备注${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input
+                      :placeholder="`请输入备注${index + 1}`"
+                      v-decorator="[`payDraftingGroupSubItemContactsList[${index}].remarks`]"
+                      :maxLength='50'
+                      @change="e => {e.target.value = (e.target.value + '').trim()}">
+                    </a-input>
+                  </a-form-item>
+                </a-col>
+                <a-col :xxl="3" :xl="4" :sm="24">
+                  <a-button type="link" class="contact-btn" @click="handleAddContact(index)">添加</a-button>
+                  <a-button type="link" class="contact-btn del-btn" @click="handleDelContact(index)">删除</a-button>
+                </a-col>
+              </a-row>
+            </template>
 
             <!--个人信息end-->
             <div class="item-title">其他信息</div>
@@ -129,10 +134,9 @@
 </template>
 
 <script>
-import {getAction} from '@api/manage'
+import {getAction, postAction} from '@api/manage'
 import CompanySelect from '@comp/company/CompanySelect'
 import SelectContacts from '@comp/company/SelectContacts'
-import {getContactsById, validateStandard} from '@api/incomePaymentsApi'
 import pick from 'lodash.pick'
 
 export default {
@@ -156,52 +160,39 @@ export default {
         xs: {span: 24},
         sm: {span: 21}
       },
+      model: {},
       validatorRules: {
-        companyId: {
-          rules: [{required: true, message: '请选择参会企业'}],
+        chargeCompany: {
+          rules: [{ required: true, validator: this.checkCompany }],
           validateTrigger: 'change'
         },
-        choiceTopic: {
-          rules: [
-            // {required: true, message: '请选择会议名称'},
-            {required: true, validator: this.checkChoiceTopic},
-          ],
-          validateTrigger: ['change']
-        },
-        inviteCode: {
-          rules: [{required: true, message: '请选择是否有邀请码'}],
+        contactsIdOne: {
+          rules: [{ required: true, message: '请选择企业联系人1' }],
           validateTrigger: 'change'
         },
-        invitationCode: {
-          rules: [{required: true, validator: this.checkCode}],
+        contactsRepeat: {
+          rules: [{ required: false, validator: this.validateContact }],
           validateTrigger: 'change'
         },
-        companyContactId: {
-          rules: [{required: true, message: '请选择参会人'}],
-          validateTrigger: 'change'
-        },
-        phone: {
-          rules: [{required: true, message: '请输入手机号'}],
-          validateTrigger: 'blur'
-        },
-        identify: {
-          rules: [{required: true, message: '请选择身份'}],
-          validateTrigger: 'change'
-        },
-        guestType: {
-          rules: [{required: true, message: '请选择嘉宾类型'}],
-          validateTrigger: 'change'
-        }
       },
+      selectedCompany: null, // 当前选中的企业
+      selectedContact1: null, // 编辑时的联系人
+      selectedContact2: null, // 编辑时的联系人
+      selectedContact3: null, // 编辑时的联系人
       confirmLoading: false,
       form: this.$form.createForm(this),
       // 起草组信息
       currentDraftTempInfo: {},
       url: {
+        add: '/drafting/payDraftingGroupSubitem/add',
         info: '/drafting/payDraftingGroup/queryById'
       },
-      // 选择企业
-      selectedCompany: null,
+      // 默认的联系人数据
+      defaultPayWorkingGroupSubItemContact: {
+        contactsId: undefined,
+        remarks: null,
+        name: null
+      }
     }
   },
   created() {
@@ -210,37 +201,174 @@ export default {
         this.currentDraftTempInfo = res.result || {}
       }
     })
+    // 默认表单显示
+    this.companyChange()
+    this.form.resetFields()
+    this.model.payDraftingGroupSubItemContactsList = []
+    this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+    this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+    this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+    this.model.chargeCompany = {
+      id: undefined,
+      companyName: undefined
+    }
+    this.$nextTick(() => {
+      this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree', 'payDraftingGroupSubItemContactsList'))
+    })
   },
   methods: {
-
-    addContactsOk() {
-      this.$refs.selectContacts.getContactsList()
-    },
-    /*
-    * 选择联系人获取信息
-    * */
-    changeContact(val) {
-      // 监听删除联系人的时候 清除对应的表单赋值
-      if (val === undefined) {
-        this.form.resetFields(['phone'])
+    // 提交
+    handleOk () {
+      if (this.confirmLoading) {
+        return
       }
       const that = this
-      // 通过id查询联系人信息
-      getContactsById({id: val}).then(res => {
-        const model = Object.assign({}, res.result)
-        // 设置手机 邮箱 职务
-        if (res.success) {
-          that.form.setFieldsValue(pick(model, 'phone'))
+      // 触发表单验证
+      this.form.validateFields((err, values) => {
+        console.log(err, values)
+        if (!err) {
+          that.confirmLoading = true
+          values.chargeCompanyTemporaryName = values.chargeCompany.companyName
+          values.chargeCompanyId = values.chargeCompany.id
+          // 当前起草组id
+          values.draftingGroupId = this.$route.query.id
+          // 企业联系人信息中将没有值的去掉
+          let haveValueContactArr = values.payDraftingGroupSubItemContactsList.filter(tt => tt.contactsId)
+          let obj = {
+            payDraftingGroupSubItemContactsList: haveValueContactArr
+          }
+          const formData = Object.assign(this.model, values, obj)
+          // 企业端添加的是需要审核 1 待审核；2 已审核；3 已驳回
+          formData.checkResult = 1
+          console.log('表单提交数据', formData)
+          postAction(this.url.add, formData).then((res) => {
+            if (res.success) {
+              let messageText = '报名成功'
+              that.$notification.success({
+                message: messageText,
+              })
+              setTimeout(() => {
+                that.handleCancel()
+              }, 500)
+              that.$emit('ok')
+              that.close()
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            setTimeout(() => {
+              this.confirmLoading = false
+            }, 1000)
+          })
+        } else {
+          this.confirmLoading = false
         }
       })
     },
-    /*
-    * 选择参会企业
-    * */
-    changeCompany(value) {
+    /**
+     * 选中企业变化，将联系人的值清空
+     * @param value
+     */
+    companyChange(value) {
+      // 当前选中的企业和之前选中的企业一致，就不修改了
+      if (this.selectedCompany && value && this.selectedCompany.id === value.id) {
+        return
+      }
       this.selectedCompany = value
-      // 选择企业清空 姓名 手机号
-      this.form.resetFields(['companyContactId', 'phone'])
+      // this.model.contactsIdOne = undefined
+      // this.model.contactsIdTwo = undefined
+      // this.model.contactsIdThree = undefined
+      // 处理默认显示的三个企业联系人
+      this.model.payDraftingGroupSubItemContactsList = []
+      this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+      this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+      this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+      // this.model.mailContactsId = undefined
+      this.selectedMailContact = null
+      this.model.contractNum = undefined
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'contractNum', 'payDraftingGroupSubItemContactsList'))
+      })
+    },
+    validateContactRequired(rule, value, callback) {
+      if (value) {
+        callback()
+      }
+      callback('请选择企业联系人1')
+    },
+    /**
+     * 校验企业联系人是否重复
+     * @param rule
+     * @param value
+     * @param callback
+     */
+    validateContact(rule, value, callback) {
+      if (value) {
+        let contactsList = this.form.getFieldValue('payDraftingGroupSubItemContactsList')
+        let hasValueArr = contactsList.filter(tt => tt.contactsId === value)
+        if (hasValueArr.length <= 1) {
+          callback()
+        }
+        callback('请选择不同的联系人')
+        return
+      }
+      callback()
+    },
+    /**
+     * 企业必填校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkCompany(rules, value, callback) {
+      if (value.id && value.companyName) {
+        callback()
+        return
+      }
+      callback('请选择成员单位')
+    },
+    /**
+     * 添加联系人
+     * @param index
+     */
+    handleAddContact(index) {
+      if (this.model.payDraftingGroupSubItemContactsList.length >= 10) {
+        this.$message.warn('最多添加十个企业联系人')
+        return
+      }
+      let obj = {
+        contactsId: undefined,
+        remarks: null
+      }
+      this.model.payDraftingGroupSubItemContactsList.splice(index + 1, 0, obj)
+      this.$forceUpdate()
+      let formData = this.form.getFieldValue('payDraftingGroupSubItemContactsList')
+      formData.splice(index + 1, 0, obj)
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ payDraftingGroupSubItemContactsList: formData })
+      })
+    },
+    /**
+     * 删除联系人
+     * @param index
+     */
+    handleDelContact(index) {
+      if (this.model.payDraftingGroupSubItemContactsList.length === 1) {
+        this.$message.warn('最少需要一个企业联系人')
+        return
+      }
+      this.model.payDraftingGroupSubItemContactsList.splice(index, 1)
+      let formData = this.form.getFieldValue('payDraftingGroupSubItemContactsList')
+      formData.splice(index, 1)
+      this.$nextTick(() => {
+        this.form.setFieldsValue({ payDraftingGroupSubItemContactsList: formData })
+      })
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
     },
     /*
      * 取消
diff --git a/src/views/draftTeam/modules/DraftTeamModal.vue b/src/views/draftTeam/modules/DraftTeamModal.vue
index 721210d..e356820 100644
--- a/src/views/draftTeam/modules/DraftTeamModal.vue
+++ b/src/views/draftTeam/modules/DraftTeamModal.vue
@@ -9,14 +9,30 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-
       <a-form :form="form">
+        <a-row v-if="defaultChargeWay">
+          <a-col>
+            <a-form-item label="起草组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-select
+                placeholder="请选择起草组项目"
+                show-search
+                v-decorator="['draftingGroupId',validatorRules.draftingGroupId]"
+                :maxLength='50'
+                :filter-option="filterOption"
+              >
+                <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>
+        </a-row>
         <a-row>
           <a-col>
             <a-form-item label="成员单位" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
               <company-select placeholder="请选择成员单位"
                               v-decorator="['chargeCompany',validatorRules.chargeCompany]"
-                              :disabled="disabledCompany"
+                              disabled
                               @change="companyChange"
                               :maxLength='50'>
               </company-select>
@@ -24,18 +40,17 @@
           </a-col>
         </a-row>
         <template
-          v-if="model.payWorkingGroupSubItemContactsList && model.payWorkingGroupSubItemContactsList.length > 0">
-          <a-row v-for="(item, index) in model.payWorkingGroupSubItemContactsList" :key="index + ''">
+          v-if="model.payDraftingGroupSubItemContactsList && model.payDraftingGroupSubItemContactsList.length > 0">
+          <a-row v-for="(item, index) in model.payDraftingGroupSubItemContactsList" :key="index + ''">
             <a-col :xl="12" :sm="24">
               <a-form-item :label="`企业联系人${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <select-contacts :selected-company="selectedCompany"
-                                 :init-contacts="model.payWorkingGroupSubItemContactsList[index]"
+                                 :init-contacts="model.payDraftingGroupSubItemContactsList[index]"
                                  :placeholder="`请选择企业联系人${index + 1}`"
-                                 v-decorator="[`payWorkingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
+                                 v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
                                  :maxLength='50'
                                  :ref="`selectContacts${index}`"
-                                 @ok="addContactsOneOk"
-                                 @change="value => contactsChange(value, index)"></select-contacts>
+                                 @ok="addContactsOneOk"></select-contacts>
               </a-form-item>
             </a-col>
             <a-col :xl="9" :sm="20">
@@ -43,7 +58,7 @@
               <a-form-item :label="`备注${index + 1}`" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-input
                   :placeholder="`请输入备注${index + 1}`"
-                  v-decorator="[`payWorkingGroupSubItemContactsList[${index}].remarks`]"
+                  v-decorator="[`payDraftingGroupSubItemContactsList[${index}].remarks`]"
                   :maxLength='50'
                   @change="e => {e.target.value = (e.target.value + '').trim()}">
                 </a-input>
@@ -55,6 +70,18 @@
             </a-col>
           </a-row>
         </template>
+        <a-row>
+          <a-col>
+            <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-textarea
+                placeholder="请输入备注"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
+                v-decorator="['remarks']"
+                :maxLength='200'
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
     </a-spin>
   </j-modal>
@@ -62,14 +89,64 @@
 
 <script>
 import pick from 'lodash.pick'
-import {httpAction} from '@api/manage'
-import SelectContacts from '@comp/company/SelectContacts'
+import {getAction, httpAction} from '@api/manage'
 import CompanySelect from '@comp/company/CompanySelect'
+import SelectContacts from '@comp/company/SelectContacts'
+import { getWorkingGroupListByNotCompany } from '../../../api/incomePaymentsApi'
+// import { isRepeat } from '../../../utils/util'
+import { addZero } from '../../../utils/util'
+import { money } from '../../../utils/validate'
 
 export default {
   name: 'DraftTeamModal',
-  components: {CompanySelect, SelectContacts},
-  data () {
+  components: { CompanySelect, SelectContacts },
+  props: {
+    // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）
+    defaultChargeWay: {
+      type: Number,
+      required: false,
+      default: null
+    },
+    // 收入合同关联时传入的企业信息，不可修改
+    defaultChargeCompany: {
+      type: Object,
+      required: false,
+      default: () => {
+        return {}
+      }
+    },
+    // 是否可以修改来款企业
+    disabledChargeCompany: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 收入合同新增项目时带入合同号且不可修改
+    defaultContractNum: {
+      type: String,
+      requirde: false,
+      default: null
+    },
+    // 合同号是否可编辑
+    isContractNumDisabled: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 企业的签订联系人id，收入合同新增企业联系人、邮寄联系人默认为签订联系人
+    signedContactId: {
+      type: String,
+      required: false,
+      default: undefined
+    },
+    // 收入合同新增时为1
+    flag: {
+      type: Number,
+      requirded: false,
+      default: null
+    }
+  },
+  data() {
     return {
       title: '操作',
       width: 800,
@@ -94,18 +171,14 @@ export default {
         sm: { span: 20 }
       },
       validatorRules: {
-        workingGroupId: {
-          rules: [{ required: true, message: '请选择工作组项目' }],
+        draftingGroupId: {
+          rules: [{ required: true, message: '请选择起草组项目' }],
           validateTrigger: 'change'
         },
         chargeCompany: {
           rules: [{ required: true, validator: this.checkCompany }],
           validateTrigger: 'change'
         },
-        taxRate: {
-          rules: [{ required: true, message: '请选择税率' }],
-          validateTrigger: 'change', initialValue: '0.06'
-        },
         contactsIdOne: {
           rules: [{ required: true, message: '请选择企业联系人1' }],
           validateTrigger: 'change'
@@ -113,14 +186,47 @@ export default {
         contactsRepeat: {
           rules: [{ required: false, validator: this.validateContact }],
           validateTrigger: 'change'
+        },
+        chargeWay: {
+          rules: [{ required: true, message: '请选择来款方式' }],
+          validateTrigger: 'change'
+        },
+        receivableAmount: {
+          rules: [{ required: true, validator: this.checkMoney }],
+          validateTrigger: 'blur'
+        },
+        contractNum: {
+          rules: [{ required: true, message: '请选择合同号' }],
+          validateTrigger: 'change'
+        },
+        charge: {
+          rules: [{ required: true, message: '请输入收费通知号' }],
+          validateTrigger: 'blur'
+        },
+        needInvoice: {
+          rules: [{ required: true, message: '请选择发票类型' }],
+          validateTrigger: 'change'
         }
       },
+      chargeWayType: null,
       selectedCompany: null, // 当前选中的企业
       selectedContact1: null, // 编辑时的联系人
       selectedContact2: null, // 编辑时的联系人
       selectedContact3: null, // 编辑时的联系人
+      selectedMailContact: null, // 编辑时的邮寄联系人
+      selectedChargeNotice: null, // 选中的收费通知号
       draftingGroupId: null,
-      disabledCompany: true, // 企业是否禁用
+      workingGroupList: [],
+      disabledCompany: false, // 企业是否禁用
+      isAssociatedContract: false, // 是否关联合同
+      // hasContactOne: false, // 是否选择联系人1
+      // hasContactTwo: false, // 是否选择联系人2
+      // hasContactThree: false, // 是否选择联系人3
+      url: {
+        info: '/drafting/payDraftingGroupSubitem/getItemById',
+        add: '/drafting/payDraftingGroupSubitem/add',
+        edit: '/drafting/payDraftingGroupSubitem/editCompany'
+      },
       // 默认的联系人数据
       defaultPayWorkingGroupSubItemContact: {
         contactsId: undefined,
@@ -130,47 +236,123 @@ export default {
     }
   },
   methods: {
+    addZero,
     add() {
       this.edit({})
-    },
-    edit(record) {
-      console.log(record)
-      // 回显选中的企业
-      record.chargeCompany = {
-        id: record.chargeCompanyId,
-        companyName: record.chargeCompanyTemporaryName
+      // 判断默认来款用途是否为合同（收入合同新增）
+      if (this.defaultChargeWay) {
+        this.loadWorkingGroupList()
+        this.chargeWayType = 2
       }
+      // 判断是否存在默认合同号（收入合同新增）
+      if (this.defaultContractNum && this.defaultContractNum !== '') {
+        this.model.contractNum = this.defaultContractNum
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'contractNum'))
+        })
+      }
+    },
+    /**
+     * 获取工作组列表
+     */
+    loadWorkingGroupList() {
+      let param = {
+        companyId: this.defaultChargeCompany.id
+      }
+      getWorkingGroupListByNotCompany(param).then(res => {
+        if (res.success) {
+          this.workingGroupList = res.result
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+    },
+    async edit(record) {
+      this.visible = true
+      this.confirmLoading = true
+      const res = await getAction(this.url.info, {
+        id: record.id,
+        draftingGroupId: record.draftingGroupId
+      })
+      this.confirmLoading = false
+      record = res.result || record
+      // 存在默认选中企业时显示默认企业
+      if (this.defaultChargeCompany.hasOwnProperty.call(this.defaultChargeCompany, 'id')) {
+        record.chargeCompany = {
+          id: this.defaultChargeCompany.id,
+          companyName: this.defaultChargeCompany.companyName
+        }
+      } else {
+        record.chargeCompany = {
+          id: record.chargeCompanyId,
+          companyName: record.chargeCompanyTemporaryName
+        }
+      }
+      // 回显选中的企业
       this.selectedCompany = record.chargeCompany
       this.companyChange(this.selectedCompany)
       this.form.resetFields()
+      record.contractNum = record.contractNum || undefined
       this.model = Object.assign({}, JSON.parse(JSON.stringify(record)))
+      // 是否存在从收入合同传入的签订联系人id
+      this.model.contactsIdOne = this.signedContactId || this.model.contactsTemporaryIdOne || undefined
+      this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined
+      this.model.contactsIdThree = this.model.contactsTemporaryIdThree || undefined
       if (this.model.id) {
         // 传给组件的init-contact值，需要id和name两个属性
-        this.model.payWorkingGroupSubItemContactsList && this.model.payWorkingGroupSubItemContactsList.forEach(item => {
+        this.model.payDraftingGroupSubItemContactsList && this.model.payDraftingGroupSubItemContactsList.forEach(item => {
           item.name = item.contactsTemporaryName
         })
+        // this.selectedContact1 = {
+        //   id: this.model.contactsTemporaryIdOne,
+        //   name: this.model.contactsTemporaryNameOne
+        // }
+        // this.selectedContact2 = {
+        //   id: this.model.contactsTemporaryIdTwo,
+        //   name: this.model.contactsTemporaryNameTwo
+        // }
+        // this.selectedContact3 = {
+        //   id: this.model.contactsTemporaryIdThree,
+        //   name: this.model.contactsTemporaryNameThree
+        // }
+        this.selectedMailContact = {
+          id: this.model.mailContactsTemporaryId,
+          name: this.model.mailContactsTemporaryName
+        }
+        // // 是否需要显示联系人备注信息
+        // if (this.model.contactsTemporaryIdOne) {
+        //   this.hasContactOne = true
+        // }
+        // if (this.model.contactsTemporaryIdTwo) {
+        //   this.hasContactTwo = true
+        // }
+        // if (this.model.contactsTemporaryIdThree) {
+        //   this.hasContactThree = true
+        // }
       } else {
         // 新增处理默认显示的三个企业联系人
-        this.model.payWorkingGroupSubItemContactsList = []
-        this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
-        this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
-        this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+        this.model.payDraftingGroupSubItemContactsList = []
+        this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+        this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+        this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
       }
+      this.chargeWayType = record.chargeWay
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree'))
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree', 'payDraftingGroupSubItemContactsList'))
       })
     },
     close() {
       this.$emit('close')
+      this.chargeWayType = null
       this.selectedCompany = null
       // 清除选中联系人信息
       this.selectedContact1 = null
       this.selectedContact2 = null
       this.selectedContact3 = null
+      this.selectedMailContact = null
       // 清除企业、来款方式、合同号的限制
       this.isAssociatedContract = false
-      // this.disabledCompany = false
       // 清除联系人备注信息
       // this.hasContactOne = false
       // this.hasContactTwo = false
@@ -189,12 +371,21 @@ export default {
       this.form.validateFields((err, values) => {
         if (!err) {
           that.confirmLoading = true
+          // 收入合同新建项目手动赋值
+          if (this.defaultChargeWay === 2) {
+            values.chargeWay = 2
+          }
+          if (this.flag === 1) {
+            values.flag = this.flag
+          }
           values.chargeCompanyTemporaryName = values.chargeCompany.companyName
           values.chargeCompanyId = values.chargeCompany.id
           let httpurl = ''
           let method = 'post'
           if (!this.model.id) {
             httpurl += this.url.add
+            // 通过添加成员来的，默认状态为通过
+            values.checkResult = 2
           } else {
             httpurl += this.url.edit
           }
@@ -202,9 +393,9 @@ export default {
             values.draftingGroupId = this.draftingGroupId
           }
           // 企业联系人信息中将没有值的去掉
-          let haveValueContactArr = values.payWorkingGroupSubItemContactsList.filter(tt => tt.contactsId)
+          let haveValueContactArr = values.payDraftingGroupSubItemContactsList.filter(tt => tt.contactsId)
           let obj = {
-            payWorkingGroupSubItemContactsList: haveValueContactArr
+            payDraftingGroupSubItemContactsList: haveValueContactArr
           }
           const formData = Object.assign(this.model, values, obj)
           console.log('表单提交数据', formData)
@@ -229,34 +420,29 @@ export default {
     handleCancel() {
       this.close()
     },
-    validateContactRequired(rule, value, callback) {
-      if (value) {
-        callback()
-      }
-      callback('请选择企业联系人1')
-    },
-    addMailContactsOk() {
-      this.$refs.selectContacts1.getContactsList()
-      this.$refs.selectContacts2.getContactsList()
-      this.$refs.selectContacts3.getContactsList()
-    },
     /**
-     * 校验企业联系人是否重复
-     * @param rule
+     * 选中企业变化，将联系人的值清空
      * @param value
-     * @param callback
      */
-    validateContact(rule, value, callback) {
-      if (value) {
-        let contactsList = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
-        let hasValueArr = contactsList.filter(tt => tt.contactsId === value)
-        if (hasValueArr.length <= 1) {
-          callback()
-        }
-        callback('请选择不同的联系人')
+    companyChange(value) {
+      // 当前选中的企业和之前选中的企业一致，就不修改了
+      if (this.selectedCompany && value && this.selectedCompany.id === value.id) {
         return
       }
-      callback()
+      this.selectedCompany = value
+      // this.model.contactsIdOne = undefined
+      // this.model.contactsIdTwo = undefined
+      // this.model.contactsIdThree = undefined
+      // 处理默认显示的三个企业联系人
+      this.model.payDraftingGroupSubItemContactsList = []
+      this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+      this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+      this.model.payDraftingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
+      this.selectedMailContact = null
+      this.model.contractNum = undefined
+      this.$nextTick(() => {
+        this.form.setFieldsValue(pick(this.model, 'contractNum', 'payDraftingGroupSubItemContactsList'))
+      })
     },
     /**
      * 企业必填校验
@@ -272,55 +458,62 @@ export default {
       callback('请选择成员单位')
     },
     /**
-     * 选中企业变化，将联系人的值清空
+     * 校验金额格式
+     * @param rules
      * @param value
+     * @param callback
      */
-    companyChange(value) {
-      // 当前选中的企业和之前选中的企业一致，就不修改了
-      if (this.selectedCompany && value && this.selectedCompany.id === value.id) {
-        return
+    checkMoney(rules, value, callback) {
+      if (value) {
+        if (money(value)) {
+          callback()
+          return
+        }
+        callback('请输入合法的金额数字,最多2位小数,10位整数')
       }
-      this.selectedCompany = value
-      // this.model.contactsIdOne = undefined
-      // this.model.contactsIdTwo = undefined
-      // this.model.contactsIdThree = undefined
-      // 处理默认显示的三个企业联系人
-      this.model.payWorkingGroupSubItemContactsList = []
-      this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
-      this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
-      this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
-      this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'payWorkingGroupSubItemContactsList'))
-      })
+      callback('请输入待确收金额')
     },
     /**
-     * 企业联系人1、邮寄联系人联动
-     * @param value
-     * @param index
+     * 在新增成功后重新获取联系人列表
      */
-    contactsChange(value, index) {
-      let formData = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
-      formData[index].contactsId = value
-      // 如果没有值，清空对应的备注
-      if (!value) {
-        formData[index].remarks = null
-      } else {
-        // 如果值和初始值不一致，则清除备注
-        if (this.model.payWorkingGroupSubItemContactsList[index].contactsId !== value) {
-          formData[index].remarks = null
-        }
+    addContactsOneOk() {
+      this.$refs.selectMailContacts.getContactsList()
+    },
+    addMailContactsOk() {
+      this.$refs.selectContacts1.getContactsList()
+      this.$refs.selectContacts2.getContactsList()
+      this.$refs.selectContacts3.getContactsList()
+    },
+    validateContactRequired(rule, value, callback) {
+      if (value) {
+        callback()
       }
-      this.$nextTick(() => {
-        this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
-        this.form.validateFields(['payWorkingGroupSubItemContactsList'])
-      })
+      callback('请选择企业联系人1')
+    },
+    /**
+     * 校验企业联系人是否重复
+     * @param rule
+     * @param value
+     * @param callback
+     */
+    validateContact(rule, value, callback) {
+      if (value) {
+        let contactsList = this.form.getFieldValue('payDraftingGroupSubItemContactsList')
+        let hasValueArr = contactsList.filter(tt => tt.contactsId === value)
+        if (hasValueArr.length <= 1) {
+          callback()
+        }
+        callback('请选择不同的联系人')
+        return
+      }
+      callback()
     },
     /**
      * 添加联系人
      * @param index
      */
     handleAddContact(index) {
-      if (this.model.payWorkingGroupSubItemContactsList.length >= 10) {
+      if (this.model.payDraftingGroupSubItemContactsList.length >= 10) {
         this.$message.warn('最多添加十个企业联系人')
         return
       }
@@ -328,12 +521,12 @@ export default {
         contactsId: undefined,
         remarks: null
       }
-      this.model.payWorkingGroupSubItemContactsList.splice(index + 1, 0, obj)
+      this.model.payDraftingGroupSubItemContactsList.splice(index + 1, 0, obj)
       this.$forceUpdate()
-      let formData = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+      let formData = this.form.getFieldValue('payDraftingGroupSubItemContactsList')
       formData.splice(index + 1, 0, obj)
       this.$nextTick(() => {
-        this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
+        this.form.setFieldsValue({ payDraftingGroupSubItemContactsList: formData })
       })
     },
     /**
@@ -341,15 +534,15 @@ export default {
      * @param index
      */
     handleDelContact(index) {
-      if (this.model.payWorkingGroupSubItemContactsList.length === 1) {
+      if (this.model.payDraftingGroupSubItemContactsList.length === 1) {
         this.$message.warn('最少需要一个企业联系人')
         return
       }
-      this.model.payWorkingGroupSubItemContactsList.splice(index, 1)
-      let formData = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+      this.model.payDraftingGroupSubItemContactsList.splice(index, 1)
+      let formData = this.form.getFieldValue('payDraftingGroupSubItemContactsList')
       formData.splice(index, 1)
       this.$nextTick(() => {
-        this.form.setFieldsValue({ payWorkingGroupSubItemContactsList: formData })
+        this.form.setFieldsValue({ payDraftingGroupSubItemContactsList: formData })
       })
     },
     // 下拉框的搜索
diff --git a/src/views/workTeam/modules/WorkTeamModal.vue b/src/views/workTeam/modules/WorkTeamModal.vue
index a5f1990..7c9dbda 100644
--- a/src/views/workTeam/modules/WorkTeamModal.vue
+++ b/src/views/workTeam/modules/WorkTeamModal.vue
@@ -9,14 +9,30 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-
       <a-form :form="form">
+        <a-row v-if="defaultChargeWay">
+          <a-col>
+            <a-form-item label="工作组项目" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-select
+                placeholder="请选择工作组项目"
+                show-search
+                v-decorator="['workingGroupId',validatorRules.workingGroupId]"
+                :maxLength='50'
+                :filter-option="filterOption"
+              >
+                <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>
+        </a-row>
         <a-row>
           <a-col>
             <a-form-item label="成员单位" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
               <company-select placeholder="请选择成员单位"
                               v-decorator="['chargeCompany',validatorRules.chargeCompany]"
-                              :disabled="disabledCompany"
+                              disabled
                               @change="companyChange"
                               :maxLength='50'>
               </company-select>
@@ -68,6 +84,19 @@
             </a-form-item>
           </a-col>
         </a-row>
+        <a-row>
+          <a-col>
+            <a-form-item label="备注" :labelCol="remarksLabelCol" :wrapperCol="remarksWrapperCol">
+              <a-textarea
+                placeholder="请输入备注"
+                :auto-size="{ minRows: 3, maxRows: 6 }"
+                v-decorator="['remarks']"
+                :maxLength='200'
+                disabled
+                @change="e => {e.target.value = (e.target.value + '').trim()}"/>
+            </a-form-item>
+          </a-col>
+        </a-row>
       </a-form>
     </a-spin>
   </j-modal>
@@ -75,14 +104,62 @@
 
 <script>
 import pick from 'lodash.pick'
-import {httpAction} from '@api/manage'
-import SelectContacts from '@comp/company/SelectContacts'
+import {getAction, postAction} from '@api/manage'
 import CompanySelect from '@comp/company/CompanySelect'
+import SelectContacts from '@comp/company/SelectContacts'
+import { getWorkingGroupListByNotCompany } from '@/api/incomePaymentsApi'
+import { addZero } from '../../../utils/util'
 
 export default {
   name: 'WorkTeamModal',
-  components: {CompanySelect, SelectContacts},
-  data () {
+  components: { CompanySelect, SelectContacts },
+  props: {
+    // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）
+    defaultChargeWay: {
+      type: Number,
+      required: false,
+      default: null
+    },
+    // 收入合同关联时传入的企业信息，不可修改
+    defaultChargeCompany: {
+      type: Object,
+      required: false,
+      default: () => {
+        return {}
+      }
+    },
+    // 是否可以修改来款企业
+    disabledChargeCompany: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 收入合同新增项目时带入合同号且不可修改
+    defaultContractNum: {
+      type: String,
+      requirde: false,
+      default: null
+    },
+    // 合同号是否可编辑
+    isContractNumDisabled: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 企业的签订联系人id，收入合同新增企业联系人、邮寄联系人默认为签订联系人
+    signedContactId: {
+      type: String,
+      required: false,
+      default: undefined
+    },
+    // 收入合同新增时为1
+    flag: {
+      type: Number,
+      requirded: false,
+      default: null
+    }
+  },
+  data() {
     return {
       title: '操作',
       width: 800,
@@ -115,10 +192,6 @@ export default {
           rules: [{ required: true, validator: this.checkCompany }],
           validateTrigger: 'change'
         },
-        taxRate: {
-          rules: [{ required: true, message: '请选择税率' }],
-          validateTrigger: 'change', initialValue: '0.06'
-        },
         contactsIdOne: {
           rules: [{ required: true, message: '请选择企业联系人1' }],
           validateTrigger: 'change'
@@ -130,15 +203,29 @@ export default {
         mailContactsId: {
           rules: [{ required: true, message: '请选择邮寄联系人' }],
           validateTrigger: 'blur'
+        },
+        chargeWay: {
+          rules: [{ required: true, message: '请选择来款方式' }],
+          validateTrigger: 'change'
         }
       },
+      chargeWayType: null,
       selectedCompany: null, // 当前选中的企业
       selectedContact1: null, // 编辑时的联系人
       selectedContact2: null, // 编辑时的联系人
       selectedContact3: null, // 编辑时的联系人
       selectedMailContact: null, // 编辑时的邮寄联系人
+      selectedChargeNotice: null, // 选中的收费通知号
       workingGroupId: null,
-      disabledCompany: true, // 企业是否禁用
+      workingGroupList: [],
+      // hasContactOne: false, // 是否选择联系人1
+      // hasContactTwo: false, // 是否选择联系人2
+      // hasContactThree: false, // 是否选择联系人3
+      url: {
+        info: '',
+        // add: '/project/payWorkingGroupSubitem/add',
+        edit: '/project/payWorkingGroupSubitem/editCompany'
+      },
       // 默认的联系人数据
       defaultPayWorkingGroupSubItemContact: {
         contactsId: undefined,
@@ -148,20 +235,70 @@ export default {
     }
   },
   methods: {
+    addZero,
     add() {
       this.edit({})
-    },
-    edit(record) {
-      console.log(record)
-      // 回显选中的企业
-      record.chargeCompany = {
-        id: record.chargeCompanyId,
-        companyName: record.chargeCompanyTemporaryName
+      // 判断默认来款用途是否为合同（收入合同新增）
+      if (this.defaultChargeWay) {
+        this.loadWorkingGroupList()
+        this.chargeWayType = 2
       }
+      // 判断是否存在默认合同号（收入合同新增）
+      if (this.defaultContractNum && this.defaultContractNum !== '') {
+        this.model.contractNum = this.defaultContractNum
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'contractNum'))
+        })
+      }
+    },
+    /**
+     * 获取工作组列表
+     */
+    loadWorkingGroupList() {
+      let param = {
+        companyId: this.defaultChargeCompany.id
+      }
+      getWorkingGroupListByNotCompany(param).then(res => {
+        if (res.success) {
+          this.workingGroupList = res.result
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+    },
+    async edit(record) {
+      // this.confirmLoading = true
+      // this.visible = true
+      // const res = await getAction(this.url.info, {
+      //   id: record.id,
+      //   draftingGroupId: record.draftingGroupId
+      // })
+      // this.confirmLoading = false
+      // record = res.result || record
+      // 存在默认选中企业时显示默认企业
+      if (this.defaultChargeCompany.hasOwnProperty.call(this.defaultChargeCompany, 'id')) {
+        record.chargeCompany = {
+          id: this.defaultChargeCompany.id,
+          companyName: this.defaultChargeCompany.companyName
+        }
+      } else {
+        record.chargeCompany = {
+          id: record.chargeCompanyId,
+          companyName: record.chargeCompanyTemporaryName
+        }
+      }
+      // 回显选中的企业
       this.selectedCompany = record.chargeCompany
       this.companyChange(this.selectedCompany)
       this.form.resetFields()
+      record.contractNum = record.contractNum || undefined
       this.model = Object.assign({}, JSON.parse(JSON.stringify(record)))
+      // 是否存在从收入合同传入的签订联系人id
+      this.model.contactsIdOne = this.signedContactId || this.model.contactsTemporaryIdOne || undefined
+      this.model.contactsIdTwo = this.model.contactsTemporaryIdTwo || undefined
+      this.model.contactsIdThree = this.model.contactsTemporaryIdThree || undefined
+      // 是否存在从收入合同传入的签订联系人id
+      this.model.mailContactsId = this.signedContactId || this.model.mailContactsTemporaryId || undefined
       if (this.model.id) {
         // 传给组件的init-contact值，需要id和name两个属性
         this.model.payWorkingGroupSubItemContactsList && this.model.payWorkingGroupSubItemContactsList.forEach(item => {
@@ -178,13 +315,15 @@ export default {
         this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
         this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
       }
+      this.chargeWayType = record.chargeWay
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId'))
+        this.form.setFieldsValue(pick(this.model, 'chargeCompany', 'contactsIdOne', 'contactsIdTwo', 'contactsIdThree', 'mailContactsId', 'chargeWay', 'charge', 'receivableAmount', 'taxRate', 'tax', 'noTaxAmount', 'estimatedArrivalDate', 'contractNum', 'receivableAmount', 'chargeNoticeId', 'needInvoice', 'remarks', 'remarksOne', 'remarksTwo', 'remarksThree', 'payWorkingGroupSubItemContactsList'))
       })
     },
     close() {
       this.$emit('close')
+      this.chargeWayType = null
       this.selectedCompany = null
       // 清除选中联系人信息
       this.selectedContact1 = null
@@ -193,7 +332,7 @@ export default {
       this.selectedMailContact = null
       // 清除企业、来款方式、合同号的限制
       this.isAssociatedContract = false
-      // this.disabledCompany = false
+      this.disabledCompany = false
       // 清除联系人备注信息
       // this.hasContactOne = false
       // this.hasContactTwo = false
@@ -206,16 +345,21 @@ export default {
       if (this.confirmLoading) {
         return
       }
-      // this.confirmLoading = true
+      this.confirmLoading = true
       const that = this
       // 触发表单验证
       this.form.validateFields((err, values) => {
         if (!err) {
-          // that.confirmLoading = true
+          that.confirmLoading = true
+          // 收入合同新建项目手动赋值
+          if (this.defaultChargeWay === 2) {
+            values.chargeWay = 2
+          }
+          if (this.flag === 1) {
+            values.flag = this.flag
+          }
           values.chargeCompanyTemporaryName = values.chargeCompany.companyName
           values.chargeCompanyId = values.chargeCompany.id
-          let httpurl = '/project/payWorkingGroupSubitem/editCompany'
-          let method = 'post'
           if (this.workingGroupId) {
             values.workingGroupId = this.workingGroupId
           }
@@ -226,8 +370,7 @@ export default {
           }
           const formData = Object.assign(this.model, values, obj)
           console.log('表单提交数据', formData)
-          return
-          httpAction(httpurl, formData, method).then((res) => {
+          postAction(this.url.edit, formData).then((res) => {
             if (res.success) {
               that.$message.success(res.message)
               that.$emit('ok')
@@ -248,54 +391,6 @@ export default {
     handleCancel() {
       this.close()
     },
-    validateContactRequired(rule, value, callback) {
-      if (value) {
-        callback()
-      }
-      callback('请选择企业联系人1')
-    },
-    /**
-     * 在新增成功后重新获取联系人列表
-     */
-    addContactsOneOk() {
-      this.$refs.selectMailContacts.getContactsList()
-    },
-    addMailContactsOk() {
-      this.$refs.selectContacts1.getContactsList()
-      this.$refs.selectContacts2.getContactsList()
-      this.$refs.selectContacts3.getContactsList()
-    },
-    /**
-     * 校验企业联系人是否重复
-     * @param rule
-     * @param value
-     * @param callback
-     */
-    validateContact(rule, value, callback) {
-      if (value) {
-        let contactsList = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
-        let hasValueArr = contactsList.filter(tt => tt.contactsId === value)
-        if (hasValueArr.length <= 1) {
-          callback()
-        }
-        callback('请选择不同的联系人')
-        return
-      }
-      callback()
-    },
-    /**
-     * 企业必填校验
-     * @param rules
-     * @param value
-     * @param callback
-     */
-    checkCompany(rules, value, callback) {
-      if (value.id && value.companyName) {
-        callback()
-        return
-      }
-      callback('请选择成员单位')
-    },
     /**
      * 选中企业变化，将联系人的值清空
      * @param value
@@ -316,10 +411,59 @@ export default {
       this.model.payWorkingGroupSubItemContactsList.push(this.defaultPayWorkingGroupSubItemContact)
       this.model.mailContactsId = undefined
       this.selectedMailContact = null
+      this.model.contractNum = undefined
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'mailContactsId', 'payWorkingGroupSubItemContactsList'))
+        this.form.setFieldsValue(pick(this.model, 'mailContactsId', 'contractNum', 'payWorkingGroupSubItemContactsList'))
       })
     },
+    /**
+     * 企业必填校验
+     * @param rules
+     * @param value
+     * @param callback
+     */
+    checkCompany(rules, value, callback) {
+      if (value.id && value.companyName) {
+        callback()
+        return
+      }
+      callback('请选择成员单位')
+    },
+    /**
+     * 在新增成功后重新获取联系人列表
+     */
+    addContactsOneOk() {
+      this.$refs.selectMailContacts.getContactsList()
+    },
+    addMailContactsOk() {
+      this.$refs.selectContacts1.getContactsList()
+      this.$refs.selectContacts2.getContactsList()
+      this.$refs.selectContacts3.getContactsList()
+    },
+    validateContactRequired(rule, value, callback) {
+      if (value) {
+        callback()
+      }
+      callback('请选择企业联系人1')
+    },
+    /**
+     * 校验企业联系人是否重复
+     * @param rule
+     * @param value
+     * @param callback
+     */
+    validateContact(rule, value, callback) {
+      if (value) {
+        let contactsList = this.form.getFieldValue('payWorkingGroupSubItemContactsList')
+        let hasValueArr = contactsList.filter(tt => tt.contactsId === value)
+        if (hasValueArr.length <= 1) {
+          callback()
+        }
+        callback('请选择不同的联系人')
+        return
+      }
+      callback()
+    },
     /**
      * 企业联系人1、邮寄联系人联动
      * @param value