From 483d5ffa26e08673c4a39f76200e054aec76ccee Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 21 Jun 2024 09:34:11 +0800 Subject: [PATCH 1/9] '123' --- .../com/ruoyi/web/controller/quot/QuotController.java | 6 ++++++ .../main/java/com/ruoyi/common/utils/http/HttpUtils.java | 9 +++------ ruoyi-ui/src/views/quot/quot/index.vue | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index d233a95..0da6853 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -721,6 +721,12 @@ public class QuotController extends BaseController @PostMapping("/commitOAQuot") public AjaxResult commitOAQuot(@RequestBody Quot quot) { + //金思维协助中不允许提交OA + String quot_jsw_approval_status = quot.getQuotJswApprovalStatus(); + if("1".equals(quot_jsw_approval_status)){ + return error("金思维协助还未完成"); + } + // 报价单提交OA,插入中间表 sys_oa_quot sys_oa_quot_material SysOaQuot sysOaQuot = new SysOaQuot(); SysOaQuot oauser = quotService.selectOAUserByUserName(getUsername());// 查询OA用户 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java index 179acc3..44a1e45 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java @@ -1,10 +1,6 @@ package com.ruoyi.common.utils.http; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.PrintWriter; +import java.io.*; import java.net.*; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; @@ -217,6 +213,7 @@ public class HttpUtils conn.setRequestProperty("connection", "Keep-Alive"); conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)"); conn.setRequestProperty("Accept-Charset", "utf-8"); + conn.setRequestProperty("Charset", "UTF-8"); conn.setRequestProperty("contentType", "application/json; charset=utf-8"); conn.setRequestProperty("Content-Type", "application/json; charset=utf-8"); // 设置Cookie头部 @@ -246,7 +243,7 @@ public class HttpUtils conn.setDoOutput(true); conn.setDoInput(true); - out = new PrintWriter(conn.getOutputStream()); + out = new PrintWriter(new OutputStreamWriter(conn.getOutputStream(),"utf-8")); out.print(param); out.flush(); in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8)); diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index eda3bae..bd81efa 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -1500,8 +1500,8 @@ export default { commitForm() { this.$refs["form"].validate(valid => { if (valid) { - if(this.quotMaterialList.length == 0 && this.quotXjFileList == 0){ - this.$message.warning("无报价产品 或 未提交询价附件!"); + if(this.quotXjFileList == 0){ + this.$message.warning("未上传询价清单附件!"); return; } From f9e4d64ddaa248bd3f74c8bd062b48497b9daf07 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 21 Jun 2024 10:52:30 +0800 Subject: [PATCH 2/9] '123' --- ruoyi-ui/src/views/quot/quot/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index bd81efa..4f8fa58 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -33,7 +33,7 @@ @keyup.enter.native="handleQuery" /> - + Date: Fri, 21 Jun 2024 11:27:50 +0800 Subject: [PATCH 3/9] '11' --- .../views/technicalConfirm/technicalConfirm/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue index 2e165db..5cc5c78 100644 --- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue +++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue @@ -46,11 +46,7 @@ - - - - - + @@ -75,6 +71,10 @@ + + + + - + diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue index 43918c2..c98080e 100644 --- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue +++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/jsxzInfo.vue @@ -10,7 +10,7 @@ - + From 39c91a126bd8cef5b3791bd8c79875fa82a94956 Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Fri, 21 Jun 2024 16:30:09 +0800 Subject: [PATCH 5/9] '222222' --- .../web/controller/quot/QuotController.java | 15 ++++++++++ .../main/java/com/ruoyi/quot/domain/Quot.java | 6 ++++ .../com/ruoyi/quot/mapper/QuotMapper.java | 6 ++++ .../com/ruoyi/quot/service/IQuotService.java | 5 ++++ .../quot/service/impl/QuotServiceImpl.java | 8 ++++++ .../main/resources/mapper/quot/QuotMapper.xml | 9 ++++-- ruoyi-ui/src/api/quot/quot.js | 9 ++++++ ruoyi-ui/src/views/quot/quot/index.vue | 28 +++++++++++++++++-- 8 files changed, 80 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 0da6853..e220602 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -887,6 +887,21 @@ public class QuotController extends BaseController return success(); } + /** + * 下载反馈附件-更新报价单状态为已处理 + */ + @PostMapping("/setHandle") + public AjaxResult setHandle(Quot quot) { + String quotId = quot.getQuotId(); + try { + quotService.setHandle(quotId); + }catch(Exception e){ + return error("系统异常!"); + } + return success(); + } + + /** * 统计有效报价单模块-获取报价单数据 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index eba39fd..d04f524 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -119,6 +119,9 @@ public class Quot extends BaseEntity /** 创建人 */ private String createName; + /** 营销经理下载反馈附件情况 */ + private String quotHandle; + /** 技术协助 */ @@ -364,6 +367,9 @@ public class Quot extends BaseEntity public String getCreateName() {return createName;} public void setCreateName(String createName) {this.createName = createName;} + public String getQuotHandle() { return quotHandle; } + + public void setQuotHandle(String quotHandle) { this.quotHandle = quotHandle; } public List getQuotMaterialList() { return quotMaterialList; } public void setQuotMaterialList(List quotMaterialList) diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java index db66ce5..89a7bb9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/mapper/QuotMapper.java @@ -148,6 +148,11 @@ public interface QuotMapper */ String getCode(String type); + /** + * 下载反馈附件-更新报价单状态为已处理 + * @param quotId + */ + void setHandle(String quotId); /** * 统计有效报价单模块-获取报价单数据 @@ -155,4 +160,5 @@ public interface QuotMapper * @return */ List selectStatisticsQuotList(Quot quot); + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java index 5a24511..f547eee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/IQuotService.java @@ -131,6 +131,11 @@ public interface IQuotService */ void updateQuotAllPassInfo(Quot quot); + /** + * 下载反馈附件-更新报价单状态为已处理 + * @param quotId + */ + void setHandle(String quotId); /** * 统计有效报价单模块-获取报价单数据 diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java index 279cd87..f9dfcd8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/service/impl/QuotServiceImpl.java @@ -279,6 +279,14 @@ public class QuotServiceImpl implements IQuotService quotMapper.updateQuot(quot); } + /** + * 下载反馈附件-更新报价单状态为已处理 + * @param quotId + */ + @Override + public void setHandle(String quotId) { + quotMapper.setHandle(quotId); + } /** * 统计有效报价单模块-获取报价单数据 diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index ae99598..4d13c50 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -115,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,a.quot_materials_count, a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, - a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name, + a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,a.quot_handle, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, @@ -161,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status, a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName, - a.create_by, a.create_time, a.update_by, a.update_time, + a.create_by, a.create_time, a.update_by, a.update_time,a.quot_handle, a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter, a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id, @@ -513,7 +514,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" {call GetSerialNo(#{type,mode=IN,jdbcType=VARCHAR})} - + + update quot set quot_handle = '1' where quot_id = #{quotId} + diff --git a/ruoyi-ui/src/api/quot/quot.js b/ruoyi-ui/src/api/quot/quot.js index e09e114..5fbd4db 100644 --- a/ruoyi-ui/src/api/quot/quot.js +++ b/ruoyi-ui/src/api/quot/quot.js @@ -176,6 +176,15 @@ export function rejectQuot(data) { }) } +//下载反馈附件-更新报价单状态为已处理 +export function setHandle(quotId) { + return request({ + url: '/quot/quot/setHandle', + method: 'post', + params: {quotId:quotId} + }) +} + //统计有效报价单模块-获取报价单数据 diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 4f8fa58..f63c238 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -161,6 +161,11 @@ + + +