diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 368cb57..405e07e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ + @@ -9,21 +10,42 @@ + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + @@ -103,12 +127,11 @@ - - - - - - + + + + + @@ -236,7 +259,9 @@ - + + + 1709259560561 @@ -285,10 +310,10 @@ - - + + - + @@ -299,15 +324,19 @@ + + + + - + - + @@ -319,66 +348,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - + + + - - - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -414,15 +443,15 @@ - + - + - + - + @@ -440,11 +469,11 @@ - - + + - - + + @@ -458,7 +487,17 @@ - + + + + + + file://$PROJECT_DIR$/ruoyi-ui/src/views/bid/bid/index.vue + 334 + + + diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination index c4ddd73..ba5a1fe 100644 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -1,5 +1,5 @@ #for tests only ! -#Wed Jul 24 14:31:44 CST 2024 +#Fri Jul 26 15:59:24 CST 2024 jco.destination.pool_capacity=10 jco.client.lang=ZH jco.client.ashost=172.19.0.125 @@ -7,5 +7,5 @@ jco.client.saprouter= jco.client.user=RFC jco.client.sysnr=00 jco.destination.peak_limit=10 -jco.client.passwd=u/Mp~k!?{);`pi!g;HElxsF9pcG@L;pQe(qqQJKCwOg@`uHx +jco.client.passwd=w-HV6Kx+x}mx.m$]3oNY)OS%9W9{p#qs{,9T}Kk)QS]%)O]F jco.client.client=800 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java index 7134be5..ba01a0d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/bid/BidController.java @@ -74,7 +74,7 @@ public class BidController extends BaseController /** * 分派 */ - @PreAuthorize("@ss.hasPermi('bid:bid:assign')") + /*@PreAuthorize("@ss.hasPermi('bid:bid:assign')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", serviceImplMethod="selectBidByBidId", tableId = "bidId",codeName = "bidCode") @@ -95,7 +95,7 @@ public class BidController extends BaseController bidService.updateBid(entity); } return success(); - } + }*/ /** * 查询投标信息列表 @@ -105,14 +105,13 @@ public class BidController extends BaseController public TableDataInfo list(Bid bid) { startPage(); - - // 获取用户角色 --判断是否是投标小组-标书制作员角色 + /*// 获取用户角色 --判断是否是投标小组-标书制作员角色 Boolean bidBszzYRoleFlag = SecurityUtils.hasRole("BID_BSZZY"); Boolean adminRoleFlag = SecurityUtils.hasRole("admin"); if(bidBszzYRoleFlag&&!adminRoleFlag){ bid.setSetReceiveUser("0"); bid.setReceiveUserName(getUsername()); - } + }*/ List list = bidService.selectBidList(bid); return getDataTable(list); } @@ -120,10 +119,10 @@ public class BidController extends BaseController /** * 修改保存投标信息列表单元格数据 */ - @PreAuthorize("@ss.hasPermi('bid:bid:updateListBid')") + @PreAuthorize("@ss.hasAnyPermi('bid:bid:updateListBid,bid:bid:updateListBid2')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", serviceImplMethod="selectBidByBidId", - tableId = "bidId",codeName = "bidCode") + tableId = "bidId",codeName = "bidCode",title = "修改保存列表数据") @PostMapping("/updateListBid") public AjaxResult updateListBid(@RequestBody Bid bid) { @@ -153,10 +152,28 @@ public class BidController extends BaseController return success(bidService.selectBidByBidId(bidId)); } + + /** + * 新增投标信息 + */ + @PreAuthorize("@ss.hasPermi('bid:bid:confirm')") + @Log(title = "投标经理确认", businessType = BusinessType.UPDATE) + @PostMapping("/confirmBid") + public AjaxResult confirmBid(@RequestBody Bid bid) + { + String bidNumber = bidService.getCodeTB("T"); + bid.setBidNumber(bidNumber); + bid.setBidConfirmStatus("0");//更新确认状态 为 已确认 + return success(bidService.updateBid(bid)); + } + /** * 新增投标信息 */ @PreAuthorize("@ss.hasPermi('bid:bid:add')") + @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", + serviceImplMethod="selectBidByBidId", + tableId = "bidId",codeName = "bidCode",title = "投标信息新增") @Log(title = "投标信息新增", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Bid bid) @@ -188,7 +205,7 @@ public class BidController extends BaseController @PreAuthorize("@ss.hasPermi('bid:bid:edit')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", serviceImplMethod="selectBidByBidId", - tableId = "bidId",codeName = "bidCode") + tableId = "bidId",codeName = "bidCode",title = "投标信息修改") @Log(title = "投标信息修改", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Bid bid) @@ -285,7 +302,7 @@ public class BidController extends BaseController @PreAuthorize("@ss.hasPermi('bid:bid:commit')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", serviceImplMethod="selectBidByBidId", - tableId = "bidId",codeName = "bidCode") + tableId = "bidId",codeName = "bidCode",title = "业务员提交投标") @Log(title = "投标信息提交投标办", businessType = BusinessType.OTHER) @PostMapping("/commitTbxx") public AjaxResult commitTbxx(@RequestBody Bid bid) @@ -416,7 +433,7 @@ public class BidController extends BaseController @PreAuthorize("@ss.hasPermi('bid:bid:assist')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", serviceImplMethod="selectBidByBidId", - tableId = "bidId",codeName = "bidCode") + tableId = "bidId",codeName = "bidCode",title = "投标提交技术协助") @Log(title = "投标提交技术协助", businessType = BusinessType.OTHER) @PostMapping("/commitJsBid") public AjaxResult commitJsBid(@RequestBody Bid bid) @@ -481,6 +498,9 @@ public class BidController extends BaseController * 报价单提交核价协助 */ @PreAuthorize("@ss.hasPermi('bid:bid:assistHj')") + @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", + serviceImplMethod="selectBidByBidId", + tableId = "bidId",codeName = "bidCode",title = "投标提交核价协助") @Log(title = "投标提交核价协助", businessType = BusinessType.OTHER) @PostMapping("/commitHjBid") public AjaxResult commitHjBid(@RequestBody Bid bid) @@ -514,7 +534,7 @@ public class BidController extends BaseController @PreAuthorize("@ss.hasPermi('bid:bid:reject')") @ChangeRecordLog(serviceImplclass = "com.ruoyi.bid.service.impl.BidServiceImpl", serviceImplMethod="selectBidByBidId", - tableId = "bidId",codeName = "bidCode") + tableId = "bidId",codeName = "bidCode",title = "投标驳回") @Log(title = "投标驳回", businessType = BusinessType.OTHER) @PostMapping("/rejectBid") public AjaxResult rejectBid(@RequestBody Bid bid) diff --git a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class index 6ed91d5..70a890b 100644 Binary files a/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class and b/ruoyi-admin/target/classes/com/ruoyi/web/controller/bid/BidController.class differ diff --git a/ruoyi-admin/target/maven-archiver/pom.properties b/ruoyi-admin/target/maven-archiver/pom.properties index 7f86a04..266b1e2 100644 --- a/ruoyi-admin/target/maven-archiver/pom.properties +++ b/ruoyi-admin/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Jul 25 08:19:43 CST 2024 +#Fri Jul 26 16:42:15 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-admin diff --git a/ruoyi-admin/target/ruoyi-admin.jar b/ruoyi-admin/target/ruoyi-admin.jar index 88d3169..4d5f7ec 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar and b/ruoyi-admin/target/ruoyi-admin.jar differ diff --git a/ruoyi-admin/target/ruoyi-admin.jar.original b/ruoyi-admin/target/ruoyi-admin.jar.original index 3ed3212..a9ebc0e 100644 Binary files a/ruoyi-admin/target/ruoyi-admin.jar.original and b/ruoyi-admin/target/ruoyi-admin.jar.original differ diff --git a/ruoyi-common/target/maven-archiver/pom.properties b/ruoyi-common/target/maven-archiver/pom.properties index 952befd..7cafb88 100644 --- a/ruoyi-common/target/maven-archiver/pom.properties +++ b/ruoyi-common/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Jul 25 08:19:32 CST 2024 +#Fri Jul 26 16:42:03 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-common diff --git a/ruoyi-common/target/ruoyi-common-3.8.7.jar b/ruoyi-common/target/ruoyi-common-3.8.7.jar index 531c4b2..5e48385 100644 Binary files a/ruoyi-common/target/ruoyi-common-3.8.7.jar and b/ruoyi-common/target/ruoyi-common-3.8.7.jar differ diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordAspect.java index bb7063b..93657bf 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordAspect.java @@ -9,6 +9,7 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.domain.SysChangeRecord; import com.ruoyi.system.mapper.SysChangeRecordMapper; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.After; @@ -89,19 +90,26 @@ public class ChangeRecordAspect { e.printStackTrace(); log.error("service加载失败:", e); } - if ("add".equals(operateLog.type())) { +/* if ("add".equals(operateLog.type())) { Map dataMap = (Map) objectToMap(object); log.info("新增的数据:{}" + dataMap.toString()); - } + }*/ + + List> list = new ArrayList>(); if (operateLog.needDefaultCompare()) { - //比较新数据与数据库原数据 - List> list = defaultDealUpdate(object, oldMap, operateLog.tableId(),operateLog.codeName()); + String id = (String) oldMap.get(operateLog.tableId()); + if(StringUtils.isEmpty(id)){ + list = defaultDealAdd(object, operateLog.tableId(),operateLog.codeName()); + }else{ + list = defaultDealUpdate(object, oldMap, operateLog.tableId(),operateLog.codeName()); + } for (Map dataMap : list) { changeRecord.setChangeField(String.valueOf(dataMap.get("filedName"))); changeRecord.setBeforeChange(String.valueOf(dataMap.get("oldValue"))); changeRecord.setAfterChange(String.valueOf(dataMap.get("newValue"))); changeRecord.setTypeId(String.valueOf(dataMap.get(operateLog.tableId()))); changeRecord.setCodeName(String.valueOf(dataMap.get(operateLog.codeName()))); + changeRecord.setTitle(operateLog.title()); changeRecordMapper.insertChangeRecord(changeRecord); } } @@ -112,6 +120,47 @@ public class ChangeRecordAspect { } + private List> defaultDealAdd(Object newObject, String tableId, String codeName) { + try { + List> list = new ArrayList<>(); + Map newMap = (Map) objectToMap(newObject); + Object finalNewObject = newObject; + newMap.forEach((k, v) -> { + Object newResult = newMap.get(k); + v = v==null?"":v; + newResult = newResult==null?"":newResult; + if(!StringUtil.isEmpty(String.valueOf(newResult))){ + Field field = ReflectionUtils.getAccessibleField(finalNewObject, k); + DataName dataName = field.getAnnotation(DataName.class); + if (null != dataName && StringUtils.isNotEmpty(dataName.name())) { + //翻译表达式 0=男,1=女 + String readConverterExp = dataName.readConverterExp(); + Map result = new HashMap(); + result.put("filedName", dataName.name()); + result.put(tableId, newMap.get(tableId)); + result.put(codeName, newMap.get(codeName)); + if (StringUtils.isNotEmpty(dataName.readConverterExp())) { + String newValue = convertByExp( + String.valueOf(newResult), dataName.readConverterExp(), ","); + result.put("oldValue", ""); + result.put("newValue", newValue); + } else { + result.put("oldValue", ""); + result.put("newValue", newResult); + } + list.add(result); + } + } + }); + log.info("比较的数据哈:{}" + list.toString()); + return list; + } catch (Exception e) { + log.error("比较异常", e); + e.printStackTrace(); + throw new RuntimeException("比较异常", e); + } + } + private List> defaultDealUpdate(Object newObject, Map oldMap, String tableId, String codeName) { try { List> list = new ArrayList<>(); @@ -119,7 +168,9 @@ public class ChangeRecordAspect { Object finalNewObject = newObject; oldMap.forEach((k, v) -> { Object newResult = newMap.get(k); - if (null != v && !v.equals(newResult)) { + v = v==null?"":v; + newResult = newResult==null?"":newResult; + if (!v.equals(newResult)) { Field field = ReflectionUtils.getAccessibleField(finalNewObject, k); DataName dataName = field.getAnnotation(DataName.class); if (null != dataName && StringUtils.isNotEmpty(dataName.name())) { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordLog.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordLog.java index 5bde3ee..39edd50 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordLog.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/ChangeRecordLog.java @@ -31,4 +31,7 @@ public @interface ChangeRecordLog { //操作类型 String type() default "update"; + //操作事件 + String title() default ""; + } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/DefaultContentParse.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/DefaultContentParse.java index 669b710..5ccdf56 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/DefaultContentParse.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/changeRecord/DefaultContentParse.java @@ -17,7 +17,10 @@ public class DefaultContentParse implements ContentParser { public Object getResult(JoinPoint joinPoint, ChangeRecordLog operateLog, String tableId) throws Exception { Object info = joinPoint.getArgs()[0]; Object id = ReflectionUtils.getFieldValue(info, tableId); - Assert.notNull(id, "id不能为空"); + if(id==null){ + return info; + } + String serviceImplName = operateLog.serviceImplclass(); String serviceImplMethod = operateLog.serviceImplMethod(); diff --git a/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordAspect.class b/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordAspect.class index df6a539..05d2cf3 100644 Binary files a/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordAspect.class and b/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordAspect.class differ diff --git a/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordLog.class b/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordLog.class index adcd597..97f18dc 100644 Binary files a/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordLog.class and b/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/ChangeRecordLog.class differ diff --git a/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/DefaultContentParse.class b/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/DefaultContentParse.class index 5e25e87..1d8d571 100644 Binary files a/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/DefaultContentParse.class and b/ruoyi-framework/target/classes/com/ruoyi/framework/changeRecord/DefaultContentParse.class differ diff --git a/ruoyi-framework/target/maven-archiver/pom.properties b/ruoyi-framework/target/maven-archiver/pom.properties index 054d5f4..72de319 100644 --- a/ruoyi-framework/target/maven-archiver/pom.properties +++ b/ruoyi-framework/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Jul 25 08:19:37 CST 2024 +#Fri Jul 26 16:42:09 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-framework diff --git a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar index 962b064..04c000d 100644 Binary files a/ruoyi-framework/target/ruoyi-framework-3.8.7.jar and b/ruoyi-framework/target/ruoyi-framework-3.8.7.jar differ diff --git a/ruoyi-generator/target/maven-archiver/pom.properties b/ruoyi-generator/target/maven-archiver/pom.properties index b6e4589..1914656 100644 --- a/ruoyi-generator/target/maven-archiver/pom.properties +++ b/ruoyi-generator/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Jul 25 08:19:38 CST 2024 +#Fri Jul 26 16:42:11 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-generator diff --git a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar index 525cd7f..f781bf1 100644 Binary files a/ruoyi-generator/target/ruoyi-generator-3.8.7.jar and b/ruoyi-generator/target/ruoyi-generator-3.8.7.jar differ diff --git a/ruoyi-quartz/target/maven-archiver/pom.properties b/ruoyi-quartz/target/maven-archiver/pom.properties index fece864..23335f3 100644 --- a/ruoyi-quartz/target/maven-archiver/pom.properties +++ b/ruoyi-quartz/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Jul 25 08:19:38 CST 2024 +#Fri Jul 26 16:42:10 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-quartz diff --git a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar index 3abab2f..b162a75 100644 Binary files a/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar and b/ruoyi-quartz/target/ruoyi-quartz-3.8.7.jar differ diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java index 5e59453..0cee16e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/domain/Bid.java @@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import java.lang.reflect.Field; import java.util.Date; /** @@ -16,15 +17,18 @@ import java.util.Date; */ public class Bid extends BaseEntity { - private static final long serialVersionUID = 1L; - /** */ private String bidId; private String[] bidIds; + /** 投标单号 */ + @Excel(name = "投标单号") + private String bidCode; + /** 标书编号 */ @Excel(name = "标书编号") - private String bidCode; + @DataName(name = "标书编号") + private String bidNumber; /** 业务员账号 */ private String bidSalesmanCode; @@ -34,7 +38,6 @@ public class Bid extends BaseEntity /** 业务员 */ @Excel(name = "业务员") - @DataName(name = "业务员") private String bidSalesmanName; /** 部门ID */ @@ -44,7 +47,7 @@ public class Bid extends BaseEntity private String bidSalesmanDeptName; /** 是否报名 */ - @DataName(name = "是否报名") + @DataName(name = "是否报名",readConverterExp="0=是,1=否") private String bidHasRegistration; /** 原报名编号 */ @@ -57,9 +60,9 @@ public class Bid extends BaseEntity @DataName(name = "开标日期") private String bidOpeningDate; - /** 是否网上报价（0-是/1-否） */ - @Excel(name = "是否网上报价",dictType = "bid_online_quotation") - @DataName(name = "是否网上报价",readConverterExp="0=是,1=否") + /** 网上报价（0-是/1-否） */ + @Excel(name = "网上报价",dictType = "bid_online_quotation") + @DataName(name = "网上报价",readConverterExp="0=是,1=否") private String bidOnlineQuotation; /** 报价平台网址 */ @@ -220,6 +223,10 @@ public class Bid extends BaseEntity @DataName(name = "审核人") private String bidShr; + /** 投标经理确认 */ + @DataName(name = "投标经理确认",readConverterExp="0=已确认,1=未确认") + private String bidConfirmStatus; + /** 提交状态 */ @Excel(name = "提交状态",dictType = "bid_approval_status") @DataName(name = "提交状态",readConverterExp="0=待提交,1=协助中,2=已完成,3=已驳回,4=审批中") @@ -312,6 +319,9 @@ public class Bid extends BaseEntity { return bidCode; } + public String getBidNumber() { return bidNumber; } + + public void setBidNumber(String bidNumber) { this.bidNumber = bidNumber; } public String getBidSalesmanCode() { return bidSalesmanCode; } public void setBidSalesmanCode(String bidSalesmanCode) { this.bidSalesmanCode = bidSalesmanCode; } @@ -642,6 +652,9 @@ public class Bid extends BaseEntity { return bidShr; } + public String getBidConfirmStatus() { return bidConfirmStatus; } + + public void setBidConfirmStatus(String bidConfirmStatus) { this.bidConfirmStatus = bidConfirmStatus; } public void setBidApprovalStatus(String bidApprovalStatus) { this.bidApprovalStatus = bidApprovalStatus; @@ -743,4 +756,5 @@ public class Bid extends BaseEntity public String getBidHjRemark() { return bidHjRemark; } public void setBidHjRemark(String bidHjRemark) { this.bidHjRemark = bidHjRemark; } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java b/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java index 4f61c04..305d578 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/mapper/BidMapper.java @@ -77,12 +77,19 @@ public interface BidMapper public int deleteBidByBidIds(String[] bidIds); /** - * 获取单据编号 + * 获取系统单据编号 * @param type * @return */ String getCode(String type); + /** + * 获取业务单据编号 + * @param type + * @return + */ + String getCodeTB(String type); + /** * 查询OA用户 * @return diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java b/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java index 4aa650f..364e2d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/service/IBidService.java @@ -86,12 +86,19 @@ public interface IBidService public int deleteBidByBidId(String bidId); /** - * 获取单据编号 + * 获取系统单据编号 * @param type * @return */ String getCode(String type); + /** + * 获取业务单据编号 + * @param type + * @return + */ + String getCodeTB(String type); + /** * 查询OA用户 * @return diff --git a/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java index dd25190..e8460ea 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/bid/service/impl/BidServiceImpl.java @@ -131,7 +131,7 @@ public class BidServiceImpl implements IBidService } /** - * 获取单据编号 + * 获取系统单据编号 * @param type * @return */ @@ -140,6 +140,16 @@ public class BidServiceImpl implements IBidService return bidMapper.getCode(type); } + /** + * 获取业务单据编号 + * @param type + * @return + */ + @Override + public String getCodeTB(String type) { + return bidMapper.getCodeTB(type); + } + /** * 查询OA用户 * @return diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysChangeRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysChangeRecord.java index b2e3130..66c95f7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysChangeRecord.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysChangeRecord.java @@ -8,6 +8,7 @@ public class SysChangeRecord { private String afterChange; private String typeId; private String codeName; + private String title; public String getChangeTime() { return changeTime; @@ -60,4 +61,8 @@ public class SysChangeRecord { public String getCodeName() { return codeName; } public void setCodeName(String codeName) { this.codeName = codeName; } + + public String getTitle() { return title; } + + public void setTitle(String title) { this.title = title; } } diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml index 5820b9b..b591f0f 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml @@ -7,6 +7,7 @@ + @@ -54,6 +55,7 @@ + @@ -99,7 +101,7 @@ - select a.bid_id, a.bid_code,a.bid_salesman_code, a.bid_salesman_bm, a.bid_salesman_name, + select a.bid_id, a.bid_code,a.bid_number,a.bid_salesman_code, a.bid_salesman_bm, a.bid_salesman_name, a.bid_salesman_dept_id, a.bid_salesman_dept_name,a.bid_has_registration,a.bid_registration_number, a.bid_opening_date, a.bid_online_quotation, a.bid_website, a.bid_tendering_unit_bm,a.bid_tendering_unit, a.bid_agency, a.bid_project, a.bid_authorized_representative, a.bid_authorized_phone, @@ -111,7 +113,7 @@ a.bid_bond, a.bid_winning_service_fee, a.bid_performance_bond, a.bid_delivery_date, a.bid_warranty_period, a.bid_bidding, a.bid_evaluation_method, a.bid_technical_require, a.bid_price_linkage, a.bid_payment_method, a.bid_other_matters, a.bid_zbr, a.bid_jdr, - a.bid_shr, a.bid_approval_status, a.bid_notification_award, a.bid_remark,a.bid_returnRemark, + a.bid_shr, a.bid_confirm_status, a.bid_approval_status, a.bid_notification_award, a.bid_remark,a.bid_returnRemark, a.set_receive_user,a.receive_user_name,a.receive_user_nick_name,a.bid_status,a.create_by,u.nick_name create_name, a.create_time, a.update_by, a.update_time, @@ -135,14 +137,18 @@ and bid_code like concat('%', #{bidCode}, '%') + and u.nick_name like concat('%', #{bidSalesmanName}, '%') + and bid_authorized_representative like concat('%', #{bidAuthorizedRepresentative}, '%') and bid_opening_date between #{params.beginBidOpeningDate} and #{params.endBidOpeningDate} and bid_tendering_unit like concat('%', #{bidTenderingUnit}, '%') + and bid_agency like concat('%', #{bidAgency}, '%') and bid_project like concat('%', #{bidProject}, '%') - and bid_authorized_representative like concat('%', #{bidAuthorizedRepresentative}, '%') + and bid_status = #{bidStatus} + and bid_zbr like concat('%', #{bidZbr}, '%') and bid_approval_status = #{bidApprovalStatus} - and set_receive_user = #{setReceiveUser} - and receive_user_name = #{receiveUserName} + ${params.dataScope} @@ -159,6 +165,7 @@ bid_id, bid_code, + bid_number, bid_salesman_code, bid_salesman_bm, bid_salesman_name, @@ -206,6 +213,7 @@ bid_zbr, bid_jdr, bid_shr, + bid_confirm_status, bid_approval_status, bid_notification_award, bid_remark, @@ -213,7 +221,7 @@ set_receive_user, receive_user_name, receive_user_nick_name, - bid_status, + bid_status, bid_jsxz_approval_status, bid_jsxz_technical_requirement, @@ -231,6 +239,7 @@ #{bidId}, #{bidCode}, + #{bidNumber}, #{bidSalesmanCode}, #{bidSalesmanBm}, #{bidSalesmanName}, @@ -278,6 +287,7 @@ #{bidZbr}, #{bidJdr}, #{bidShr}, + #{bidConfirmStatus}, #{bidApprovalStatus}, #{bidNotificationAward}, #{bidRemark}, @@ -285,7 +295,7 @@ #{setReceiveUser}, #{receiveUserName}, #{receiveUserNickName}, - #{bidStatus}, + #{bidStatus}, #{bidJsxzApprovalStatus}, #{bidJsxzTechnicalRequirement}, @@ -364,6 +374,7 @@ update bid bid_code = #{bidCode}, + bid_number = #{bidNumber}, bid_salesman_code = #{bidSalesmanCode}, bid_salesman_bm = #{bidSalesmanBm}, bid_salesman_name = #{bidSalesmanName}, @@ -411,6 +422,7 @@ bid_zbr = #{bidZbr}, bid_jdr = #{bidJdr}, bid_shr = #{bidShr}, + bid_confirm_status = #{bidConfirmStatus}, bid_approval_status = #{bidApprovalStatus}, bid_notification_award = #{bidNotificationAward}, bid_remark = #{bidRemark}, @@ -418,7 +430,7 @@ set_receive_user = #{setReceiveUser}, receive_user_name = #{receiveUserName}, receive_user_nick_name = #{receiveUserNickName}, - bid_status = #{bidStatus}, + bid_status = #{bidStatus}, bid_jsxz_approval_status = #{bidJsxzApprovalStatus}, bid_jsxz_technical_requirement = #{bidJsxzTechnicalRequirement}, @@ -450,6 +462,9 @@ + select a.changeTime,b.nick_name createName,a.changeField, - a.beforeChange,a.afterChange,a.typeId,a.codeName + a.beforeChange,a.afterChange,a.typeId,a.codeName,a.title from sys_change_record a left join sys_user b on a.createName = b.user_name where a.typeId = #{typeId} diff --git a/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml b/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml index b1c926d..05bd634 100644 --- a/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/zgys/ZgysMapper.xml @@ -54,13 +54,14 @@ and pq_code like concat('%', #{pqCode}, '%') - and pq_salesman_name like concat('%', #{pqSalesmanName}, '%') + and pq_illustrate = #{pqIllustrate} + and u.nick_name like concat('%', #{pqSalesmanName}, '%') + and pq_authorized_representative like concat('%', #{pqAuthorizedRepresentative}, '%') and pq_customer_name like concat('%', #{pqCustomerName}, '%') and pq_project like concat('%', #{pqProject}, '%') + and pq_bid_date between #{params.beginPqOpeningDate} and #{params.endPqOpeningDate} + and pq_zbr like concat('%', #{pqZbr}, '%') and pq_approval_status = #{pqApprovalStatus} - and pq_archiving = #{pqArchiving} - and pq_empower = #{pqEmpower} - ${params.dataScope} diff --git a/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class b/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class index eb4d078..c94947c 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class and b/ruoyi-system/target/classes/com/ruoyi/bid/domain/Bid.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class b/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class index 8ec1f9f..a8f63c4 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class and b/ruoyi-system/target/classes/com/ruoyi/bid/mapper/BidMapper.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class b/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class index 594787c..ac49f2b 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class and b/ruoyi-system/target/classes/com/ruoyi/bid/service/IBidService.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class b/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class index 6721bff..02a0eeb 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class and b/ruoyi-system/target/classes/com/ruoyi/bid/service/impl/BidServiceImpl.class differ diff --git a/ruoyi-system/target/classes/com/ruoyi/system/domain/SysChangeRecord.class b/ruoyi-system/target/classes/com/ruoyi/system/domain/SysChangeRecord.class index b646304..2bec92a 100644 Binary files a/ruoyi-system/target/classes/com/ruoyi/system/domain/SysChangeRecord.class and b/ruoyi-system/target/classes/com/ruoyi/system/domain/SysChangeRecord.class differ diff --git a/ruoyi-system/target/classes/mapper/bid/BidMapper.xml b/ruoyi-system/target/classes/mapper/bid/BidMapper.xml index 5820b9b..b591f0f 100644 --- a/ruoyi-system/target/classes/mapper/bid/BidMapper.xml +++ b/ruoyi-system/target/classes/mapper/bid/BidMapper.xml @@ -7,6 +7,7 @@ + @@ -54,6 +55,7 @@ + @@ -99,7 +101,7 @@ - select a.bid_id, a.bid_code,a.bid_salesman_code, a.bid_salesman_bm, a.bid_salesman_name, + select a.bid_id, a.bid_code,a.bid_number,a.bid_salesman_code, a.bid_salesman_bm, a.bid_salesman_name, a.bid_salesman_dept_id, a.bid_salesman_dept_name,a.bid_has_registration,a.bid_registration_number, a.bid_opening_date, a.bid_online_quotation, a.bid_website, a.bid_tendering_unit_bm,a.bid_tendering_unit, a.bid_agency, a.bid_project, a.bid_authorized_representative, a.bid_authorized_phone, @@ -111,7 +113,7 @@ a.bid_bond, a.bid_winning_service_fee, a.bid_performance_bond, a.bid_delivery_date, a.bid_warranty_period, a.bid_bidding, a.bid_evaluation_method, a.bid_technical_require, a.bid_price_linkage, a.bid_payment_method, a.bid_other_matters, a.bid_zbr, a.bid_jdr, - a.bid_shr, a.bid_approval_status, a.bid_notification_award, a.bid_remark,a.bid_returnRemark, + a.bid_shr, a.bid_confirm_status, a.bid_approval_status, a.bid_notification_award, a.bid_remark,a.bid_returnRemark, a.set_receive_user,a.receive_user_name,a.receive_user_nick_name,a.bid_status,a.create_by,u.nick_name create_name, a.create_time, a.update_by, a.update_time, @@ -135,14 +137,18 @@ and bid_code like concat('%', #{bidCode}, '%') + and u.nick_name like concat('%', #{bidSalesmanName}, '%') + and bid_authorized_representative like concat('%', #{bidAuthorizedRepresentative}, '%') and bid_opening_date between #{params.beginBidOpeningDate} and #{params.endBidOpeningDate} and bid_tendering_unit like concat('%', #{bidTenderingUnit}, '%') + and bid_agency like concat('%', #{bidAgency}, '%') and bid_project like concat('%', #{bidProject}, '%') - and bid_authorized_representative like concat('%', #{bidAuthorizedRepresentative}, '%') + and bid_status = #{bidStatus} + and bid_zbr like concat('%', #{bidZbr}, '%') and bid_approval_status = #{bidApprovalStatus} - and set_receive_user = #{setReceiveUser} - and receive_user_name = #{receiveUserName} + ${params.dataScope} @@ -159,6 +165,7 @@ bid_id, bid_code, + bid_number, bid_salesman_code, bid_salesman_bm, bid_salesman_name, @@ -206,6 +213,7 @@ bid_zbr, bid_jdr, bid_shr, + bid_confirm_status, bid_approval_status, bid_notification_award, bid_remark, @@ -213,7 +221,7 @@ set_receive_user, receive_user_name, receive_user_nick_name, - bid_status, + bid_status, bid_jsxz_approval_status, bid_jsxz_technical_requirement, @@ -231,6 +239,7 @@ #{bidId}, #{bidCode}, + #{bidNumber}, #{bidSalesmanCode}, #{bidSalesmanBm}, #{bidSalesmanName}, @@ -278,6 +287,7 @@ #{bidZbr}, #{bidJdr}, #{bidShr}, + #{bidConfirmStatus}, #{bidApprovalStatus}, #{bidNotificationAward}, #{bidRemark}, @@ -285,7 +295,7 @@ #{setReceiveUser}, #{receiveUserName}, #{receiveUserNickName}, - #{bidStatus}, + #{bidStatus}, #{bidJsxzApprovalStatus}, #{bidJsxzTechnicalRequirement}, @@ -364,6 +374,7 @@ update bid bid_code = #{bidCode}, + bid_number = #{bidNumber}, bid_salesman_code = #{bidSalesmanCode}, bid_salesman_bm = #{bidSalesmanBm}, bid_salesman_name = #{bidSalesmanName}, @@ -411,6 +422,7 @@ bid_zbr = #{bidZbr}, bid_jdr = #{bidJdr}, bid_shr = #{bidShr}, + bid_confirm_status = #{bidConfirmStatus}, bid_approval_status = #{bidApprovalStatus}, bid_notification_award = #{bidNotificationAward}, bid_remark = #{bidRemark}, @@ -418,7 +430,7 @@ set_receive_user = #{setReceiveUser}, receive_user_name = #{receiveUserName}, receive_user_nick_name = #{receiveUserNickName}, - bid_status = #{bidStatus}, + bid_status = #{bidStatus}, bid_jsxz_approval_status = #{bidJsxzApprovalStatus}, bid_jsxz_technical_requirement = #{bidJsxzTechnicalRequirement}, @@ -450,6 +462,9 @@ + select a.changeTime,b.nick_name createName,a.changeField, - a.beforeChange,a.afterChange,a.typeId,a.codeName + a.beforeChange,a.afterChange,a.typeId,a.codeName,a.title from sys_change_record a left join sys_user b on a.createName = b.user_name where a.typeId = #{typeId} diff --git a/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml b/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml index b1c926d..05bd634 100644 --- a/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml +++ b/ruoyi-system/target/classes/mapper/zgys/ZgysMapper.xml @@ -54,13 +54,14 @@ and pq_code like concat('%', #{pqCode}, '%') - and pq_salesman_name like concat('%', #{pqSalesmanName}, '%') + and pq_illustrate = #{pqIllustrate} + and u.nick_name like concat('%', #{pqSalesmanName}, '%') + and pq_authorized_representative like concat('%', #{pqAuthorizedRepresentative}, '%') and pq_customer_name like concat('%', #{pqCustomerName}, '%') and pq_project like concat('%', #{pqProject}, '%') + and pq_bid_date between #{params.beginPqOpeningDate} and #{params.endPqOpeningDate} + and pq_zbr like concat('%', #{pqZbr}, '%') and pq_approval_status = #{pqApprovalStatus} - and pq_archiving = #{pqArchiving} - and pq_empower = #{pqEmpower} - ${params.dataScope} diff --git a/ruoyi-system/target/maven-archiver/pom.properties b/ruoyi-system/target/maven-archiver/pom.properties index 9a5765f..4dd6740 100644 --- a/ruoyi-system/target/maven-archiver/pom.properties +++ b/ruoyi-system/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Thu Jul 25 08:19:34 CST 2024 +#Fri Jul 26 16:42:06 CST 2024 version=3.8.7 groupId=com.ruoyi artifactId=ruoyi-system diff --git a/ruoyi-system/target/ruoyi-system-3.8.7.jar b/ruoyi-system/target/ruoyi-system-3.8.7.jar index 4c67b9e..1bea057 100644 Binary files a/ruoyi-system/target/ruoyi-system-3.8.7.jar and b/ruoyi-system/target/ruoyi-system-3.8.7.jar differ diff --git a/ruoyi-ui/src/api/bid/bid.js b/ruoyi-ui/src/api/bid/bid.js index 5d02c0c..7ad7039 100644 --- a/ruoyi-ui/src/api/bid/bid.js +++ b/ruoyi-ui/src/api/bid/bid.js @@ -35,6 +35,15 @@ export function getBid(bidId) { }) } +// 投标经理确认 +export function confirmBid(data) { + return request({ + url: '/bid/bid/confirmBid', + method: 'post', + data: data + }) +} + // 新增投标信息 export function addBid(data) { return request({ diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index ec6a409..2e7eee7 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -117,6 +117,25 @@ font-size: 13px; } } + .el-table__fixed { + height: auto !important; + bottom: 8px !important; + } + .el-table__fixed::before, .el-table__fixed::before { + display: none; + } + + //修改滚动条的宽度和高度（横向是高度，纵向是宽度） + ::-webkit-scrollbar { + width: 8px; + height: 8px; + background-color: transparent; + } + //加宽滚动条的错层问题 + .el-scrollbar__wrap::-webkit-scrollbar { + width: 8px; + height: 8px; + } .el-table__body-wrapper { .el-button [class*="el-icon-"] + span { diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index 89c7946..2577c69 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -127,19 +127,19 @@ Element.Dialog.props.closeOnClickModal.default = false //聚焦事件 Vue.directive("focus", { - bind:function (el) { // 1.每当指令绑定到元素上的时候，会立即执行这个bind函数，【执行一次】 - el.focus() - }, inserted:function (el) { // 2.当元素插入到DOM中的时候，会执行 inserted 函数， 【触发一次】 - if(el.tagName.toLocaleLowerCase() == 'input'){ + if (el.nodeName === 'INPUT' || el.nodeName === 'TEXTAREA') { + // 如果直接是input标签/textarea标签 el.focus() - }else{ - if(el.getElementsByTagName('input')){ - el.getElementsByTagName('input')[0].focus() + } else { + // 指令在van-search组件身上, 获取的是组件根标签div, 而input在标签内 + const inp = el.querySelector('input') + const textArea = el.querySelector('textarea') + // 如果找到了 + if (inp || textArea) { + inp && inp.focus() + textArea && textArea.focus() } } - }, - updated:function ( ) { // 3.当VNode更新的时候，会执行 updated,【可能触发多次】 - el.focus() } }) diff --git a/ruoyi-ui/src/views/bid/bid/index.vue b/ruoyi-ui/src/views/bid/bid/index.vue index e639a48..43fa1f2 100644 --- a/ruoyi-ui/src/views/bid/bid/index.vue +++ b/ruoyi-ui/src/views/bid/bid/index.vue @@ -8,6 +8,22 @@ clearable @keyup.enter.native="handleQuery" /> + ' + + + + + + + + - + + + + + + @@ -54,16 +88,6 @@ /> - - - - - 搜索 重置 @@ -113,7 +137,7 @@ v-hasPermi="['bid:bid:export']" >导出 - + - + @@ -151,66 +175,124 @@ - - - - + - - - + + + - - + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + @@ -257,7 +339,7 @@ - + - + @@ -297,13 +379,13 @@ type="date" value-format="yyyy-MM-dd" placeholder="请选择开标日期" - :disabled="this.form.bidApprovalStatus != '0' && this.form.bidApprovalStatus != null"> + :disabled="ywyDis"> - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -1012,6 +1094,9 @@
+ + 确认投标 + 保 存 提 交 @@ -1074,7 +1159,7 @@ import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数 import { getToken } from "@/utils/auth"; import { listZgys} from "@/api/zgys/zgys"; -import { versionList,getTongLvPrice,bidAssign,updateListBid, listBid, getBid, delBid, addBid, updateBid, bidFileList,bidFileDelete, commitTbxx,commitJsBid, commitHjBid, rejectBid } from "@/api/bid/bid"; +import { versionList,getTongLvPrice,bidAssign,updateListBid, listBid, getBid, delBid, confirmBid, addBid, updateBid, bidFileList,bidFileDelete, commitTbxx,commitJsBid, commitHjBid, rejectBid } from "@/api/bid/bid"; /** 弹窗放大、拖拽 */ import elDragDialog from "@/directive/dialog/dragDialog"; /** 导入技术确认单详情组件*/ @@ -1240,6 +1325,9 @@ export default { tabClickLabel: '', // 当前点击的列名 tabClickProperty: '', // 当前点击的列字段名 tabClickValue: '', // 当前点击的列字段值 + + //业务员编辑状态 + ywyDis: false }; }, created() { @@ -1440,6 +1528,11 @@ export default { } } + const bidApprovalStatus = this.form.bidApprovalStatus; + if(checkRole(['SALES_MAN'])&&("1"==bidApprovalStatus||"4"==bidApprovalStatus)){ + this.ywyDis = true; + } + //获取投标信息-附件列表 this.getBidYwyFileList(); this.getBidTbbFileList(); @@ -1447,6 +1540,16 @@ export default { this.getBidHjFileList(); }); }, + + //投标经理确认 + confirmBid() { + confirmBid(this.form).then(response => { + this.$modal.msgSuccess("确认成功"); + this.open = false; + this.getList(); + }); + }, + /** 保存按钮 */ saveForm() { this.$refs["form"].validate(valid => { @@ -1821,6 +1924,21 @@ export default { case '项目名称': this.setIndexLabelValue(row,column); break + case '网上报价': + this.setIndexLabelValue(row,column); + break + case '开标日期': + this.setIndexLabelValue(row,column); + break + case '投标状态': + this.setIndexLabelValue(row,column); + break + case '招标代理': + this.setIndexLabelValue(row,column); + break + case '联系电话': + this.setIndexLabelValue(row,column); + break default: return } }, @@ -1830,9 +1948,10 @@ export default { this.tabClickLabel = column.label //记录列名 this.tabClickProperty = column.property //记录字段名 this.tabClickValue = this.bidList[this.tabClickIndex]?this.bidList[this.tabClickIndex][this.tabClickProperty]:'';//记录旧值 + this.tabClickValue = this.tabClickValue==null?"":this.tabClickValue; }, - // 失去焦点保存修改信息数据 + // 文本框失去焦点保存修改信息数据 inputBlur() { let param = {} const tabId = this.tabId @@ -1852,9 +1971,23 @@ export default { } param = {'bidId':tabId,'bidAuthorizedRepresentative':tabClickValue} } + + if(this.tabClickLabel == '联系电话'){ + if(!tabClickValue){ + this.$modal.msgError("联系电话必填"); + this.bidList[this.tabClickIndex][this.tabClickProperty] = this.tabClickValue;//选择取消则设置为旧值 + + this.tabClickIndex = null + this.tabClickLabel = '' + return; + } + param = {'bidId':tabId,'bidAuthorizedPhone':tabClickValue} + } + if(this.tabClickLabel == '制标人'){ param = {'bidId':tabId,'bidZbr':tabClickValue} } + if(this.tabClickLabel == '项目名称'){ if(!tabClickValue){ this.$modal.msgError("项目名称必填"); @@ -1867,15 +2000,93 @@ export default { param = {'bidId':tabId,'bidProject':tabClickValue} } + if(this.tabClickLabel == '招标代理'){ + param = {'bidId':tabId,'bidAgency':tabClickValue} + } + + if(tabClickValue==this.tabClickValue){ + this.tabClickIndex = null + this.tabClickLabel = '' + }else{ + if(Object.keys(param).length!=0){//如果修改对象为空则不保存 + this.updateListBid(param,this.tabClickLabel) + }else{ + this.tabClickIndex = null + this.tabClickLabel = '' + } + } + }, + + // 下拉框失去焦点保存修改信息数据 + selectBlur() { + let param = {} + const tabId = this.tabId + const tabClickIndex = this.tabClickIndex + const tabClickProperty = this.tabClickProperty + let tabClickValue = this.bidList[tabClickIndex]?this.bidList[tabClickIndex][tabClickProperty]:''; + tabClickValue = tabClickValue==null?"":tabClickValue; + + if(this.tabClickLabel == '网上报价'){ + param = {'bidId':tabId,'bidOnlineQuotation':tabClickValue} + } + if(this.tabClickLabel == '投标状态'){ + param = {'bidId':tabId,'bidStatus':tabClickValue} + } + if(Object.keys(param).length!=0){//如果修改对象为空则不保存 - this.updateListBid(param) + this.updateListBid(param,this.tabClickLabel) }else{ this.tabClickIndex = null this.tabClickLabel = '' } }, - updateListBid(param){ - this.$modal.confirm('是否保存所修改的投标信息？').then(function() { + + // 日期选择框失去焦点保存修改信息数据 + selectDateBlur() { + let param = {} + const tabId = this.tabId + const tabClickIndex = this.tabClickIndex + const tabClickProperty = this.tabClickProperty + let tabClickValue = this.bidList[tabClickIndex] ? this.bidList[tabClickIndex][tabClickProperty] : ''; + tabClickValue = tabClickValue == null ? "" : tabClickValue; + + if (this.tabClickLabel == '开标日期') { + if(!tabClickValue){ + this.$modal.msgError("开标日期必填"); + this.bidList[this.tabClickIndex][this.tabClickProperty] = this.tabClickValue;//选择取消则设置为旧值 + this.tabClickIndex = null + this.tabClickLabel = '' + return; + } + param = {'bidId': tabId, 'bidOpeningDate': tabClickValue} + } + + if(Object.keys(param).length!=0){//如果修改对象为空则不保存 + this.updateListBid(param,this.tabClickLabel) + }else{ + this.tabClickIndex = null + this.tabClickLabel = '' + } + }, + + changeBlur() { + let that = this + setTimeout(function(){ + const tabClickIndex = that.tabClickIndex + const tabClickProperty = that.tabClickProperty + let tabClickValue = that.bidList[tabClickIndex]?that.bidList[tabClickIndex][tabClickProperty]:''; + tabClickValue = tabClickValue==null?"":tabClickValue; + + if(tabClickValue==that.tabClickValue){ + that.tabClickIndex = null + that.tabClickLabel = '' + } + },300) + }, + + //保存列表修改信息数据 + updateListBid(param,labelName){ + this.$modal.confirm('是否保存所修改的投标信息【'+labelName+'】？').then(function() { return updateListBid(param) }).then(() => { this.$modal.msgSuccess("保存成功"); diff --git a/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue b/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue index 0027acc..2a87dd4 100644 --- a/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue +++ b/ruoyi-ui/src/views/components/Tools/ChangeRecord/index.vue @@ -1,6 +1,7 @@