From a0aa7ad6456f5515db7d1e46adffaef92dc0b97d Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Wed, 15 Dec 2021 10:31:12 +0800 Subject: [PATCH] =?UTF-8?q?[add]=20=E6=99=AE=E9=80=9A=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9=E7=9B=AE=E7=BC=B4?= =?UTF-8?q?=E8=B4=B9=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/MessagePage/PaymentVoucher.vue | 2 ++ .../modules/PaymentVoucherModal.vue | 28 +++++++++++-------- src/views/mineProject/MineProject.vue | 3 +- src/views/workTeam/WorkTeam.vue | 3 +- src/views/workTeam/WorkTeamDetail.vue | 4 +-- vue.config.js | 6 ++-- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/views/MessagePage/PaymentVoucher.vue b/src/views/MessagePage/PaymentVoucher.vue index 6efdca3..af3530e 100644 --- a/src/views/MessagePage/PaymentVoucher.vue +++ b/src/views/MessagePage/PaymentVoucher.vue @@ -237,6 +237,8 @@ export default { * 添加阶段 */ addStage() { + this.$refs.stageModal.projectId = this.$route.query.projectId + this.$refs.stageModal.projectType = this.$route.query.projectType this.$refs.stageModal.visible = true } } diff --git a/src/views/MessagePage/modules/PaymentVoucherModal.vue b/src/views/MessagePage/modules/PaymentVoucherModal.vue index 259fafc..3cd98b0 100644 --- a/src/views/MessagePage/modules/PaymentVoucherModal.vue +++ b/src/views/MessagePage/modules/PaymentVoucherModal.vue @@ -25,7 +25,7 @@ date-format="YYYY-MM-DD"/> - @@ -39,6 +39,8 @@ import { addZero } from '@/utils/util' import { money } from '@/utils/validate' import JImageUpload from '@comp/jero/JImageUpload' import JDate from '@comp/tools/JDate' +import { postAction } from '@api/manage' +import pick from 'lodash.pick' export default { name: 'PaymentVoucherModal', @@ -68,11 +70,17 @@ export default { rules: [{ required: true, message: '请选择缴费日期' }], validateTrigger: 'change' }, - paymentRecord: { + proof: { rules: [{ required: true, message: '请上传付款凭证' }], validateTrigger: 'change' } - } + }, + url: { + add: '/paymentCheck/payPaymentCheck/applicant', + edit: '' + }, + projectId: '', + projectType: '' } }, methods: { @@ -85,7 +93,7 @@ export default { this.model = Object.assign({}, record) this.visible = true this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model, 'amountReceived', 'paymentDate', 'remark')) + this.form.setFieldsValue(pick(this.model, 'amountReceived', 'paymentDate', 'proof')) }) }, handleOk() { @@ -97,16 +105,14 @@ export default { if (!err) { values.projectId = this.projectId values.projectType = this.projectType - const obj = Object.assign(this.model, values) - let okHttpMethod + const formData = Object.assign(this.model, values) + let url if (this.model.id) { - okHttpMethod = editAmountPhase(obj) + url = this.url.edit } else { - let arr = [] - arr.push(obj) - okHttpMethod = addPaymentPhase(arr) + url = this.url.add } - okHttpMethod.then(res => { + postAction(url, formData).then(res => { if (res.success) { this.$message.success(res.message) this.$emit('ok') diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue index 703a4ef..6165704 100644 --- a/src/views/mineProject/MineProject.vue +++ b/src/views/mineProject/MineProject.vue @@ -147,7 +147,8 @@ export default { path: '/MessagePage/PaymentVoucher', query: { projectId: record.id, - projectName: record.chargeProject + projectName: record.chargeProject, + projectType: 1 } }) } diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue index 345d3c8..314bc92 100644 --- a/src/views/workTeam/WorkTeam.vue +++ b/src/views/workTeam/WorkTeam.vue @@ -156,7 +156,8 @@ export default { path: '/MessagePage/PaymentVoucher', query: { projectId: record.id, - projectName: record.chargeProject + projectName: record.chargeProject, + projectType: 2 } }) }, diff --git a/src/views/workTeam/WorkTeamDetail.vue b/src/views/workTeam/WorkTeamDetail.vue index 3deee16..3c2338b 100644 --- a/src/views/workTeam/WorkTeamDetail.vue +++ b/src/views/workTeam/WorkTeamDetail.vue @@ -40,7 +40,7 @@ - {{ detail.remarks }} + {{ detail.missionAndObjectives }} @@ -166,7 +166,7 @@ export default { ipagination: { current: 1, pageSize: 10, - pageSizeOptions: ['10', '20', '30', '50', '100'], + pageSizeOptions: ['10', '20', '30'], showTotal: (total, range) => { return range[0] + '-' + range[1] + ' 共' + total + '条' }, diff --git a/vue.config.js b/vue.config.js index c6b249f..1843579 100644 --- a/vue.config.js +++ b/vue.config.js @@ -79,7 +79,7 @@ module.exports = { }, devServer: { - port: 21826, + port: 3001, proxy: { /* '/api': { target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统 @@ -91,14 +91,14 @@ module.exports = { },*/ '/jero-boot': { // target: 'http://localhost:21824', //请求本地 jero-boot后台项目 - target: 'http://10.0.10.78:21824', //请求本地 jero-boot后台项目 + target: 'http://localhost:8080', //请求本地 jero-boot后台项目 ws: false, changeOrigin: true }, // 会员系统的路由转发 '/memberApi': { // target: 'http://localhost:9000', //请求本地 jero-boot后台项目 - target: 'http://10.0.10.78:9000', //请求本地 jero-boot后台项目 + target: 'http://localhost:8080', //请求本地 jero-boot后台项目 ws: false, changeOrigin: true, pathRewrite: {