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 @@
+
+
+
+ {{ item.contractNum }}
+
+
+
+
+
+
+
\ 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 @@
- {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+
@@ -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 @@
- {e.target.value = (e.target.value + '').trim()}">
+
+
+
+
+
+
+ :disabled="isContractNumDisabled || isAssociatedContract"
+
@@ -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: {