[update] 收入合同关联新建普通项目表单修改；新建工作组候选工作组列表修改

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -105,8 +105,9 @@
       </a-row>
       <a-row>
         <a-col :xl="12" :sm="24">
-          <a-form-item label="来款方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-radio-group v-decorator="['chargeWay',validatorRules.chargeWay]" @change="handlechargeWayChange">
+          <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 :value="1">无</a-radio>
               <a-radio :value="2">合同</a-radio>
               <a-radio :value="3">收费通知</a-radio>
@@ -185,7 +186,13 @@ export default {
       type: Boolean,
       required: false,
       default: false
-    }
+    },
+    // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）
+    defaultChargeWay: {
+      type: Number,
+      required: false,
+      default: null
+    },
   },
   data() {
     return {
@@ -274,7 +281,9 @@ export default {
   methods: {
     add() {
       this.edit({})
-      console.log(this.defaultChargeCompany, '============')
+      if (this.defaultChargeWay === 2) {
+        this.chargeWayType = 2
+      }
     },
     edit(record) {
       if (this.defaultChargeCompany.hasOwnProperty.call(this.defaultChargeCompany, 'id')) {
@@ -321,6 +330,10 @@ export default {
         if (!err) {
           values.chargeCompanyName = values.chargeCompany.companyName
           values.chargeCompanyId = values.chargeCompany.id
+          // 收入合同新建项目手动赋值
+          if (this.defaultChargeWay === 2) {
+            values.chargeWay = 2
+          }
           let httpurl = ''
           let method = 'post'
           if (!this.model.id) {