From cff0c93cf8a51be5e1dcdcd53363f1437400c169 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 1 Sep 2021 17:52:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=9B=E8=B5=84=E6=96=99=E7=BE=A4=E7=BB=84?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 7 + .../committee/CommitteeMaintenance.vue | 251 ++++++++---------- .../modules/CommitteeMemberModule.vue | 36 ++- .../committee/modules/CommitteeModule.vue | 9 +- .../GeneralProjectManagement.vue | 8 +- .../MemberUnitMaintenance.vue | 87 ++++-- .../WorkingGroupProjectManagement.vue | 4 +- 7 files changed, 221 insertions(+), 181 deletions(-) create mode 100644 src/api/incomePaymentsApi.js diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js new file mode 100644 index 0000000..1a66f6a --- /dev/null +++ b/src/api/incomePaymentsApi.js @@ -0,0 +1,7 @@ +import { getAction } from '@api/manage' + +const getWorkingGroupById = (params) => getAction('/project/payWorkingGroup/queryById', params) + +export { + getWorkingGroupById +} \ No newline at end of file diff --git a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue index 8e6adc0..38a6daf 100644 --- a/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue +++ b/src/views/dataNetworkDiskManagement/committee/CommitteeMaintenance.vue @@ -1,97 +1,91 @@ diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue index 9133e01..368083f 100644 --- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue +++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeMemberModule.vue @@ -12,8 +12,8 @@ - - + { this.form.setFieldsValue(pick(this.model, 'name')) @@ -137,16 +144,16 @@ export default { // 触发表单验证 this.form.validateFields((err, values) => { if (!err) { - values.dataSource = this.dataForm - values.signingUp = this.applyAdd - let httpurl = '' + let httpurl = this.url.add let method = 'post' - if (!this.model.id) { - httpurl += this.url.add - } else { - httpurl += this.url.edit + const submitValue = Object.assign(this.model, values) + const formData = { + committeeId: submitValue.committeeId, + companyId: submitValue.companyId, + companyName: submitValue.companyName, + contactsId: submitValue.contactsId, + contactsName: submitValue.contactsName } - const formData = Object.assign(this.model, values) console.log('表单提交数据', formData) httpAction(httpurl, formData, method).then((res) => { if (res.success) { @@ -173,8 +180,11 @@ export default { console.log(value) this.selectedCompany = value this.model.contactsId = undefined + this.model.email = undefined + this.model.phone = undefined + this.model.post = undefined this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'contactsId', 'mailContactsId')) + this.form.setFieldsValue(pick(this.model, 'contactsId', 'email', 'phone', 'post')) }) }, /** diff --git a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue index 02b19ca..d24d1f3 100644 --- a/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue +++ b/src/views/dataNetworkDiskManagement/committee/modules/CommitteeModule.vue @@ -64,6 +64,10 @@ export default { rules: [{ required: true, message: '请输入分标委名称' }], validateTrigger: 'blur' } + }, + url: { + add: '/payCaseCommittee/payCaseCommittee/add', + edit: '/payCaseCommittee/payCaseCommittee/edit' } } }, @@ -76,7 +80,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, )) + this.form.setFieldsValue(pick(this.model, 'name', 'remark')) }) }, close() { @@ -88,8 +92,6 @@ export default { // 触发表单验证 this.form.validateFields((err, values) => { if (!err) { - values.dataSource = this.dataForm - values.signingUp = this.applyAdd let httpurl = '' let method = 'post' if (!this.model.id) { @@ -97,6 +99,7 @@ export default { } else { httpurl += this.url.edit } + console.log(values, '============') const formData = Object.assign(this.model, values) console.log('表单提交数据', formData) httpAction(httpurl, formData, method).then((res) => { diff --git a/src/views/projectManagement/GeneralProjectManagement.vue b/src/views/projectManagement/GeneralProjectManagement.vue index 5350e83..34f405f 100644 --- a/src/views/projectManagement/GeneralProjectManagement.vue +++ b/src/views/projectManagement/GeneralProjectManagement.vue @@ -13,7 +13,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -162,7 +162,7 @@ export default { title: '来款单位', align: 'center', width: 200, - dataIndex: 'chargeCompanyName', + dataIndex: 'chargeCompanyTemporaryName', scopedSlots: { customRender: 'text' } }, { title: '应收金额', @@ -184,7 +184,7 @@ export default { title: '企业联系人', align: 'center', width: 140, - dataIndex: 'contactsName', + dataIndex: 'contactsTemporaryName', scopedSlots: { customRender: 'text' } }, { title: '打包', diff --git a/src/views/projectManagement/MemberUnitMaintenance.vue b/src/views/projectManagement/MemberUnitMaintenance.vue index 0dca2e5..5e13b92 100644 --- a/src/views/projectManagement/MemberUnitMaintenance.vue +++ b/src/views/projectManagement/MemberUnitMaintenance.vue @@ -2,25 +2,31 @@
+
工作组信息
-
{{ item.title }}:
-
+
+ {{ workingGroupDetail[item.fieldName] }} +
+
{{ workingGroupDetail[item.fieldName] }}
任务及目标:
-
+
{{ workingGroupDetail.missionAndObjectives }}
备注:
-
+
{{ workingGroupDetail.remarks }}
+
成员信息
@@ -99,6 +105,7 @@ import { JeroListMixin } from '@/mixins/JeroListMixin' import JYearDate from '@comp/jero/JYearDate' import PageHeaderTitle from '@comp/layouts/PageHeaderTitle' +import { getWorkingGroupById } from '@api/incomePaymentsApi' export default { name: 'MemberUnitMaintenance', @@ -111,42 +118,43 @@ export default { }, data() { return { + disableMixinCreated: true, workingGroupProject: '', workingGroupProjectId: '', detailTitleList: [ { title: '工作组项目名称', - fieldName: '' + fieldName: 'workingGroupProject' }, { title: '负责人A', - fieldName: '' + fieldName: 'principalNameA' }, { title: '负责人B', - fieldName: '' + fieldName: 'principalNameB' }, { title: '每年召开次数', - fieldName: '' + fieldName: 'convokeNum' }, { title: '运行周期', - fieldName: '' + fieldName: 'operationCycle' }, { title: '本年应收款A', - fieldName: '' + fieldName: 'yearChargeA' }, { title: '收费通知号A', - fieldName: '' + fieldName: 'chargeNoticeNoA' }, { title: '收费通知A', - fieldName: '' + fieldName: 'chargeNoticeAId' }, { title: '本年应收款B', - fieldName: '' + fieldName: 'yearChargeB' }, { title: '收费通知号B', - fieldName: '' + fieldName: 'chargeNoticeNoB' }, { title: '收费通知B', - fieldName: '' + fieldName: 'chargeNoticeBId' } ], labelCol: { @@ -229,17 +237,26 @@ export default { width: 180, scopedSlots: { customRender: 'action' } } - ] + ], + workingGroupDetail: {} } }, created() { - this.workingGroupProject = this.$route.query.workingGroupProject - this.workingGroupProjectId = this.$route.query.workingGroupProjectId + // 初始化工作组信息 + this.initWorkGruopData() }, methods: { - backWorkingGroupProject() { - this.$router.push({ - path: '/projectManagement/WorkingGroupProjectManagement' + /** + * 初始化工作组信息 + */ + initWorkGruopData() { + this.workingGroupProject = this.$route.query.workingGroupProject + this.workingGroupProjectId = this.$route.query.workingGroupProjectId + let param = { + id: this.workingGroupProjectId + } + getWorkingGroupById(param).then(res => { + this.workingGroupDetail = res.result }) } } @@ -249,12 +266,28 @@ export default { \ No newline at end of file