diff --git a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml index 003b2c1..dd828eb 100644 --- a/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml @@ -110,7 +110,7 @@ ${params.dataScope} - order by a.bidCode desc + order by a.bid_code desc @@ -573,7 +573,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and quot_distinguish is not null and quot_distinguish in ('1','2') - and quot_approval_status = '2' + and (quot_approval_status = '2' or (quot_approval_status = '3' and quot_oa_approval_status = '3')) group by quot_distinguish) a diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue index 3b5a695..efc24b7 100644 --- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue @@ -548,11 +548,11 @@ export default { /** 提交报价按钮 */ commitHj() { - var quotHjFileNum = this.quotHjFileList.length; + /*const quotHjFileNum = this.quotHjFileList.length; if(quotHjFileNum==0){ this.$modal.msgError("核价附件必须上传"); return; - } + }*/ //报价单-核价协助状态 设置为 已协助 commitHj(this.form).then(response => { this.open = false;