From 8f5d9914d252d73ad24881456fedc582a01c60ee Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Wed, 27 Oct 2021 11:28:28 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4]=20?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE=E3=80=81=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E6=96=B0=E5=A2=9E/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=EF=BC=88=E6=B7=BB=E5=8A=A0=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E5=90=88=E5=90=8C=E7=BB=84=E4=BB=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/incomePaymentsApi.js                  |  5 +-
 src/components/company/SelectPrincipal.vue    |  6 +-
 .../tools/SelectRevenueContract.vue           | 65 +++++++++++++++++++
 .../modules/GeneralProjectModule.vue          | 20 ++++--
 .../modules/WorkingGroupMemberUnitModule.vue  | 20 ++++--
 5 files changed, 100 insertions(+), 16 deletions(-)
 create mode 100644 src/components/tools/SelectRevenueContract.vue

diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js
index 28e902d..ff7d65f 100644
--- a/src/api/incomePaymentsApi.js
+++ b/src/api/incomePaymentsApi.js
@@ -82,6 +82,8 @@ const getIsAssociatedProject = (param) => getAction('/contract/payIncomeContract
 const aduitExpenditureContract = (param) => postAction('/contract/paySpendingContract/audit', param)
 // 支出合同存档
 const archiveExpenditureContract = (param) => postAction('/contract/paySpendingContract/archive', param)
+// 获取全部收入合同
+const getAllRevenueContract = (param) => getAction('', param)
 
 export {
   getWorkingGroupById,
@@ -124,5 +126,6 @@ export {
   getAllDepartTreeList,
   getIsAssociatedProject,
   aduitExpenditureContract,
-  archiveExpenditureContract
+  archiveExpenditureContract,
+  getAllRevenueContract
 }
diff --git a/src/components/company/SelectPrincipal.vue b/src/components/company/SelectPrincipal.vue
index 7a68338..accd74b 100644
--- a/src/components/company/SelectPrincipal.vue
+++ b/src/components/company/SelectPrincipal.vue
@@ -39,7 +39,11 @@ export default {
      */
     initUserList() {
       getAllUserList().then(res => {
-        this.userList = res.result
+        if (res.success) {
+          this.userList = res.result
+        } else {
+          this.$message.warn(res.message)
+        }
       })
     },
     // 下拉框的搜索
diff --git a/src/components/tools/SelectRevenueContract.vue b/src/components/tools/SelectRevenueContract.vue
new file mode 100644
index 0000000..d12b655
--- /dev/null
+++ b/src/components/tools/SelectRevenueContract.vue
@@ -0,0 +1,65 @@
+<template>
+  <a-select
+    :value="value"
+    v-bind="$attrs"
+    v-on="$listeners"
+    show-search
+    allowClear
+    option-filter-prop="children"
+    :filter-option="filterOption">
+    <a-select-option v-for="item in contractList" :key="item.id" :value="item.contractNum">
+      {{ item.contractNum }}
+    </a-select-option>
+  </a-select>
+</template>
+
+<script>
+import { getAllRevenueContract } from '../../api/incomePaymentsApi'
+
+export default {
+  name: 'SelectRevenueContract',
+  props: {
+    // 绑定值--合同号
+    value: {
+      type: String,
+      required: false,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      // 合同列表
+      contractList: []
+    }
+  },
+  created() {
+    this.initRevenueContractList()
+  },
+  methods: {
+    initRevenueContractList() {
+      getAllRevenueContract().then(res => {
+        if (res.success) {
+          this.contractList = res.result.records
+        } else {
+          this.$message.warn(res.message)
+        }
+      })
+    },
+    // 下拉框的搜索
+    filterOption(input, option) {
+      console.log(option)
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    }
+  },
+  model: {
+    prop: 'value',
+    event: 'change'
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/views/projectManagement/modules/GeneralProjectModule.vue b/src/views/projectManagement/modules/GeneralProjectModule.vue
index 114f5d8..4800cc9 100644
--- a/src/views/projectManagement/modules/GeneralProjectModule.vue
+++ b/src/views/projectManagement/modules/GeneralProjectModule.vue
@@ -120,11 +120,16 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol" v-if="chargeWayType === 2">
-              <a-input placeholder="请输入合同号"
-                       v-decorator="['contractNum',validatorRules.contractNum]"
-                       :maxLength='50'
-                       :disabled="isContractNumDisabled || isAssociatedContract"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+<!--              <a-input placeholder="请输入合同号"-->
+<!--                       v-decorator="['contractNum',validatorRules.contractNum]"-->
+<!--                       :maxLength='50'-->
+<!--                       :disabled="isContractNumDisabled || isAssociatedContract"-->
+<!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
+              <select-revenue-contract
+                placeholder="请选择合同号"
+                v-decorator="['contractNum',validatorRules.contractNum]"
+                :disabled="isContractNumDisabled || isAssociatedContract">
+              </select-revenue-contract>
             </a-form-item>
           </a-col>
         </a-row>
@@ -189,10 +194,11 @@ import Vue from 'vue'
 import { USER_INFO } from '../../../store/mutation-types'
 import { money } from '../../../utils/validate'
 import { checkAssociatedProject } from '../../../utils/projectCheck'
+import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
 
 export default {
   name: 'GeneralProjectModule',
-  components: { JYearDate, JUpload, CompanySelect, SelectPrincipal, SelectContacts },
+  components: { JYearDate, JUpload, CompanySelect, SelectPrincipal, SelectContacts, SelectRevenueContract },
   props: {
     // 收入合同关联时传入的企业信息，不可修改
     defaultChargeCompany: {
@@ -304,7 +310,7 @@ export default {
           validateTrigger: 'change'
         },
         contractNum: {
-          rules: [{ required: true, message: '请输入合同号' }],
+          rules: [{ required: true, message: '请选择合同号' }],
           validateTrigger: 'blur'
         },
         chargeNoticeNo: {
diff --git a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
index 713e304..2c71b63 100644
--- a/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
+++ b/src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue
@@ -138,11 +138,16 @@
           </a-col>
           <a-col :xl="12" :sm="24">
             <a-form-item label="合同号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入合同号"
-                       v-decorator="['contractNum',validatorRules.contractNum]"
-                       :maxLength='50'
-                       :disabled="isContractNumDisabled || isAssociatedContract"
-                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
+<!--              <a-input placeholder="请输入合同号"-->
+<!--                       v-decorator="['contractNum',validatorRules.contractNum]"-->
+<!--                       :maxLength='50'-->
+<!--                       :disabled="isContractNumDisabled || isAssociatedContract"-->
+<!--                       @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>-->
+              <select-revenue-contract
+                placeholder="请选择合同号"
+                v-decorator="['contractNum',validatorRules.contractNum]">
+                :disabled="isContractNumDisabled || isAssociatedContract"
+              </select-revenue-contract>
             </a-form-item>
           </a-col>
         </a-row>
@@ -227,10 +232,11 @@ import { isRepeat } from '../../../utils/util'
 import { addZero } from '../../../utils/util'
 import { money } from '../../../utils/validate'
 import { checkAssociatedProject } from '../../../utils/projectCheck'
+import SelectRevenueContract from '../../../components/tools/SelectRevenueContract'
 
 export default {
   name: 'WorkingGroupMemberUnitModule',
-  components: { JUpload, CompanySelect, SelectContacts },
+  components: { JUpload, CompanySelect, SelectContacts, SelectRevenueContract },
   props: {
     // 默认来款方式（收入合同新增工作组项目，来款方式默认为2--合同）
     defaultChargeWay: {
@@ -331,7 +337,7 @@ export default {
           validateTrigger: 'blur'
         },
         contractNum: {
-          rules: [{ required: true, message: '请输入合同号' }],
+          rules: [{ required: true, message: '请选择合同号' }],
           validateTrigger: 'blur'
         },
         charge: {