From c5f8e8fe48b97ebe4a402c1557d9448c6f59a1af Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 9 May 2022 15:52:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=8F=E5=88=A9=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiChangeTransfer.vue | 42 ++- .../modules/plugins/change/changedeath.vue | 38 ++- .../plugins/change/changerelocation.vue | 12 +- .../modules/plugins/change/changewelfare.vue | 267 ++++++++++++++++-- .../modules/plugins/change/resichange.vue | 2 + .../modules/plugins/change/resideath.vue | 13 +- .../modules/plugins/change/resiwelfare.vue | 8 +- 7 files changed, 319 insertions(+), 63 deletions(-) diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index b214ccd45..2dcf979f6 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -135,6 +135,11 @@ v-model="dataForm.reason"> + + 享受福利 + @@ -196,7 +201,8 @@ export default { gender: '', age: '', address: '', - outOfTime: '' + outOfTime: '', + welfareFlag: false }, customerId: '',//客户id @@ -263,6 +269,8 @@ export default { // 添加参数 if(row.DOOR_NAME !== null && row.DOOR_NAME !== '' && row.DOOR_NAME !== undefined){ this.dataForm.oldHome = row.DOOR_NAME + }else{ + this.dataForm.oldHome = '' } this.dataForm.customerId = this.customerId this.dataForm.idCard = row.ID_CARD @@ -471,16 +479,12 @@ export default { setTimeout(() => { this.btnDisable = false }, 2000) - - this.$refs['ref_form'].validate((valid, messageObj) => { if (!valid) { app.util.validateRule(messageObj) } else { if (this.dataForm.type === 'in') { - - if (!this.dataForm.buildId) { this.$message.warning('楼栋') return false @@ -507,16 +511,33 @@ export default { this.dataForm.transferTime = noData const { data, code, msg } = await requestPost(url, this.dataForm) - console.log('----------------') - console.log(this.dataForm) if (code === 0) { - this.$message.success('调动成功') - this.handleCancle() + // this.$message.success('调动成功') + // 调用之前接口 + this.saveFormOld() + // this.handleCancle() } else { this.$message.error(msg) } }, + async saveFormOld () { + const url = '/epmetuser/icusertransferrecord/add' + let noData = new Date() + noData = util.dateFormatter(noData, 'time') + this.dataForm.transferTime = noData + + console.log('-----------3--------------') + console.log(this.dataForm) + const { data, code, msg } = await requestPost(url, this.dataForm) + + if (code === 0) { + this.$message.success('调动成功') + this.handleCancle() + } else { + this.$message.error(msg) + } + }, handleCancle () { this.resetData() @@ -535,7 +556,8 @@ export default { unitId: '',//调动到的单元Id homeId: '', //调动到的房屋Id transferTime: '', //调动时间【日期类型】 - reason: '' //备注 + reason: '', //备注 + outOfTime: '' } this.customerId = ''//客户id diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue index 3ff91ba7b..69475b29c 100644 --- a/src/views/modules/plugins/change/changedeath.vue +++ b/src/views/modules/plugins/change/changedeath.vue @@ -45,6 +45,9 @@ {{ $t('query') }} + + 重置 + {{ $t('export') }} @@ -71,22 +74,22 @@ - - - - - + + + + + + + + + + + + + - +