From 62aeaf6cfd1bf621fcc9883a7de45747a6785ff6 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 25 Apr 2024 13:08:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java | 7 +++++++ .../com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java | 7 ++++--- .../src/main/resources/mapper/app/TmTaskMapper.xml | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 3a6556e8..7930eab4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -131,4 +131,11 @@ public interface TmTaskMapper { * @return */ String selectTaskNumByMonths(@Param("date") Date nowDate, @Param("taskType") Integer taskType); + + /** + * 根据任务id删除任务协议关联表 + * @param taskId + * @return + */ + int deleteTaskAgreementByTaskId(@Param("taskId") String taskId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 54db21d3..09b18d4d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -954,10 +954,11 @@ public class TmTaskServiceImpl implements TmTaskService { public AjaxResult deleteByPrimaryKey(String taskId) { int i = tmTaskMapper.deleteTaskByPrimaryKey(taskId); int j = tmTaskMapper.deleteTaskInfoByTaskId(taskId); - if (i == 1 && j == 1) { + int m = tmTaskMapper.deleteTaskAgreementByTaskId(taskId); + if (i == 1 && j == 1 && m == 1) { return AjaxResult.success("删除成功"); - } else if (i < 1 || j < 1) { - return AjaxResult.error("删除失败,任务表或信息表未删除!"); + } else if (i < 1 || j < 1 || m < 1) { + return AjaxResult.error("删除失败,任务表或信息表或任务协议关联表未删除!"); } else { return AjaxResult.error("删除失败，请检查任务ID是否正确!!"); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index 45f8f0b7..4a9ed949 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -71,6 +71,9 @@ delete from lease_apply_details where parennt_id = #{parentId} + + delete from tm_task_agreement where task_id = #{taskId} + insert into tm_task (task_type, task_status, code, create_by, create_time, update_by, update_time, remark, company_id) From 646456b1c6773cb72e7b06fb911037c5c3ca9f1d Mon Sep 17 00:00:00 2001 From: binbin_pan Date: Thu, 25 Apr 2024 13:19:04 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=201310=20=E5=A1=AB=E5=86=99=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E7=9A=84=E7=A7=9F=E8=B5=81=E6=9C=9F=E9=99=90=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E5=AD=97=E8=BF=87=E5=A4=A7=E6=97=B6=EF=BC=8C=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=9A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/views/claimAndRefund/receive/agreement.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue index 8ecd1283..3ef94d8f 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/agreement.vue @@ -254,6 +254,7 @@ placeholder="请输入租赁期限(天)" controls-position="right" :min="0" + :max="9999" style="width: 100%" /> From 7ddb70360e2d85eadcda503e1181a3ea8f61fc75 Mon Sep 17 00:00:00 2001 From: jackal <13856223047@163.com> Date: Thu, 25 Apr 2024 13:40:11 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E9=95=BF=E6=9C=9F=E9=A2=86=E6=96=99?= =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=A1=AE=E8=AE=A4=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E6=98=AF=E9=A1=B5=E9=9D=A2=E5=9B=BE=E6=A0=87=E6=9C=AA=E5=8F=98?= =?UTF-8?q?=E6=88=90=E2=80=9C=E2=88=9A=E2=80=9D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiveByCq/receiveExamineByCq.vue | 246 +++++------------- 1 file changed, 65 insertions(+), 181 deletions(-) diff --git a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue index 8fce48a3..6845eac7 100644 --- a/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue +++ b/sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue @@ -6,53 +6,26 @@ - + - + - + - + - + - + @@ -64,85 +37,31 @@ - + - + - - + + - - - + + + @@ -171,15 +90,16 @@

提交审批

-

申请人：{{queryParams.applyFor}}

-

申请时间：{{queryParams.updateTimes}}

+

申请人：{{ queryParams.applyFor }}

+

申请时间：{{ queryParams.updateTimes }}

 - + -

{{v.name}}

-

审核人：{{queryParams[v.authorKey]}}

-

审核时间：{{queryParams[v.timeKey]}}

+

{{ v.name }}

+

审核人：{{ queryParams[v.authorKey] }}

+

审核时间：{{ queryParams[v.timeKey] }}

审核意见：{{ queryParams[v.remarkKey] }}

 @@ -187,82 +107,38 @@ -
+
同意 驳回
-
+
确认
- - + +
- 取 消 - 确 定 - 确 定 + 取 消 + 确 定 + 确 定
- - + +
- 取 消 - 确 定 - 确 定 + 取 消 + 确 定 + 确 定
@@ -431,7 +307,10 @@ export default { updateLeaseTaskStatusConfirmByCq(param).then(response => { this.$modal.msgSuccess('操作成功') this.getData(taskData.taskId) - }) + }).finally(() => { + // 刷新页面 + window.location.reload(); + }); }, //审核 驳回 refuse() { @@ -475,9 +354,9 @@ export default { }, /** 查询 */ async getData(taskId) { - this.loading=true; + this.loading = true; const res = await getLeaseListAllCq({ taskId }) - this.loading=false; + this.loading = false; this.queryParams = { ...this.queryParams, ...res.rows[0] } this.$set(this.queryParams, 'leaseApplyInfo', this.queryParams.leaseApplyInfoList[0]) this.queryParams.leaseApplyDetails.forEach(v => { @@ -535,9 +414,9 @@ export default { // this.flowPath[2].icon = 'el-icon-close' // } - if(this.queryParams.leaseType=='1'){ + if (this.queryParams.leaseType == '1') { this.flowPath = [this.flowPath[2]] - }else{ + } else { this.flowPath = this.flowPath } @@ -597,7 +476,7 @@ export default { }) }, /** 提交按钮 */ - submitForm: function() { + submitForm: function () { this.$refs['form'].validate(valid => { if (valid) { if (this.form.dictId != undefined) { @@ -621,14 +500,14 @@ export default { const dictIds = row.dictId || this.ids this.$modal .confirm('是否确认删除所选择的数据项？') - .then(function() { + .then(function () { return delType(dictIds) }) .then(() => { this.getList() this.$modal.msgSuccess('删除成功') }) - .catch(() => {}) + .catch(() => { }) }, /** 导出按钮操作 */ handleExport() { @@ -654,20 +533,25 @@ export default {