xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'1111'

This commit is contained in:
xd 2024-07-17 08:11:00 +08:00
parent c4171c9eb9
commit fa70870c9d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/resources/mapper/bid/BidMapper.xml
View File

@ -110,7 +110,7 @@
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</where> </where>
order by a.bidCode desc order by a.bid_code desc
</select> </select>
<select id="selectBidByBidId" parameterType="String" resultMap="BidResult"> <select id="selectBidByBidId" parameterType="String" resultMap="BidResult">

4
ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml
View File

@ -553,7 +553,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and datediff(d, a.quot_quotation_date, #{params.endTime}) <![CDATA[>=]]> 0 and datediff(d, a.quot_quotation_date, #{params.endTime}) <![CDATA[>=]]> 0
</if> </if>
and a.quot_approval_status = '2' and (a.quot_approval_status = '2' or (a.quot_approval_status = '3' and a.quot_oa_approval_status = '3'))
</where> </where>
order by a.quot_quotation_date desc order by a.quot_quotation_date desc
</select> </select>
@ -573,7 +573,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
and quot_distinguish is not null and quot_distinguish is not null
and quot_distinguish in ('1','2') 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'))
</where> </where>
group by quot_distinguish) a group by quot_distinguish) a
</select> </select>

4
ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue
View File

@ -548,11 +548,11 @@ export default {
/** 提交报价按钮 */ /** 提交报价按钮 */
commitHj() { commitHj() {
var quotHjFileNum = this.quotHjFileList.length; /*const quotHjFileNum = this.quotHjFileList.length;
if(quotHjFileNum==0){ if(quotHjFileNum==0){
this.$modal.msgError("核价附件必须上传"); this.$modal.msgError("核价附件必须上传");
return; return;
} }*/
//报价单-核价协助状态 设置为 已协助 //报价单-核价协助状态 设置为 已协助
commitHj(this.form).then(response => { commitHj(this.form).then(response => {
this.open = false; this.open = false;