@@ -98,11 +86,6 @@
-
-
-
-
-
@@ -116,13 +99,6 @@
:default-charge-way="2"
:is-contract-num-disabled="true"
@ok="modalFormOk">
-
-
@@ -132,8 +108,6 @@ import JYearDate from '../../../../components/jero/JYearDate'
import GeneralProjectModule from '../../../projectManagement/modules/GeneralProjectModule'
import StatusSlot from '../../../../components/tools/StatusSlot'
import { associatedProject, queryUserByDepartId } from '../../../../api/incomePaymentsApi'
-import WorkingGroupMemberUnitModule from '../../../projectManagement/modules/WorkingGroupMemberUnitModule'
-import ProgressBar from '../../../../components/ProgressBar'
import { queryDepartTreeList } from '../../../../api/api'
export default {
@@ -141,18 +115,41 @@ export default {
components: {
JYearDate,
GeneralProjectModule,
- StatusSlot,
- WorkingGroupMemberUnitModule,
- ProgressBar
+ StatusSlot
},
mixins: [JeroListMixin],
+ props: {
+ // 部门id，用于查询
+ departId: {
+ type: String,
+ requird: false,
+ default: null
+ },
+ // 打包状态
+ pack: {
+ type: Number,
+ requird: false,
+ default: null
+ },
+ // 收入合同id
+ contractId: {
+ type: String,
+ requird: false,
+ default: null,
+ },
+ // 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目
+ projectType: {
+ type: Number,
+ requird: false,
+ default: null
+ }
+ },
data() {
return {
- title: '操作',
+ title: '普通项目列表',
width: 1200,
visible: false,
confirmLoading: false,
- columns: [],
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
@@ -161,22 +158,107 @@ export default {
xs: { span: 24 },
sm: { span: 10 }
},
- projectType: null, // 项目类型，1--普通项目；2--工作组项目；3--会议项目；4--会员项目
disableMixinCreated: true,
- contractId: '', // 收入合同id
url: {
- list: ''
+ list: '/project/payCommonProject/listAll'
},
- pack: null,// 是否打包
+ columns: [
+ {
+ title: '序号',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function (t, r, index) {
+ return parseInt(index) + 1
+ }
+ }, {
+ title: '来款项目',
+ align: 'center',
+ width: 200,
+ dataIndex: 'chargeProject',
+ scopedSlots: { customRender: 'projectName' }
+ }, {
+ title: '来款用途',
+ align: 'center',
+ width: 180,
+ dataIndex: 'chargeUse_dictText',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '来款单位',
+ align: 'center',
+ width: 200,
+ dataIndex: 'chargeCompanyTemporaryName',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '应收金额',
+ align: 'center',
+ width: 100,
+ dataIndex: 'receivableAmount'
+ }, {
+ title: '实收金额',
+ align: 'center',
+ width: 100,
+ dataIndex: 'paidAmount'
+ }, {
+ title: '负责人',
+ align: 'center',
+ width: 140,
+ dataIndex: 'principalName',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '企业联系人',
+ align: 'center',
+ width: 140,
+ dataIndex: 'contactsTemporaryName',
+ scopedSlots: { customRender: 'text' }
+ }, {
+ title: '打包',
+ align: 'center',
+ width: 80,
+ dataIndex: 'pack',
+ scopedSlots: { customRender: 'status-pack' }
+ }, {
+ title: '需要发票',
+ align: 'center',
+ width: 80,
+ dataIndex: 'needInvoice',
+ scopedSlots: { customRender: 'status-pack' }
+ }, {
+ title: '到账',
+ align: 'center',
+ width: 80,
+ dataIndex: 'inAccount',
+ scopedSlots: { customRender: 'status' }
+ }, {
+ title: '开票',
+ align: 'center',
+ width: 80,
+ dataIndex: 'makeInvoice',
+ scopedSlots: { customRender: 'status' }
+ }, {
+ title: '邮寄',
+ align: 'center',
+ width: 80,
+ dataIndex: 'mail',
+ scopedSlots: { customRender: 'status' }
+ }
+ ],
treeDepartData: [], // 部门列表
- userList: [] // 用户列表
+ userList: [], // 用户列表
+ }
+ },
+ // 部门id变化时绑定查询条件
+ watch: {
+ departId(val) {
+ this.queryParam.departId = val
}
},
methods: {
open() {
- this.loadData()
this.loadDepartTreeData()
this.visible = true
+ this.loadData()
},
/**
* 获取科室（部门）数据
@@ -230,21 +312,12 @@ export default {
this.close()
},
/**
- * 打开不同类型项目的新增module
+ * 打开新增module
*/
handleAdd() {
- switch (this.projectType) {
- case 1:
- this.$refs.generalProjectForm.add()
- this.$refs.generalProjectForm.title = '新增'
- this.$refs.generalProjectForm.disableSubmit = false
- break
- case 2:
- this.$refs.workingGroupMemberForm.add()
- this.$refs.workingGroupMemberForm.title = '新增'
- this.$refs.workingGroupMemberForm.disableSubmit = false
- break
- }
+ this.$refs.generalProjectForm.add()
+ this.$refs.generalProjectForm.title = '新增'
+ this.$refs.generalProjectForm.disableSubmit = false
},
// 下拉框的搜索
filterOption(input, option) {
@@ -267,7 +340,15 @@ export default {
console.log(res.message)
}
})
- }
+ },
+ /**
+ * 重置
+ */
+ searchReset() {
+ this.lastQueryParam = {}
+ this.queryParam.departId = this.departId
+ this.loadData(1)
+ },
}
}
diff --git a/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue
new file mode 100644
index 0000000..335eda8
--- /dev/null
+++ b/src/views/contractManagement/revenueContract/modules/SelectWorkingGroupProjectModule.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+
+
\ No newline at end of file