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

'123'

This commit is contained in:
xd 2024-06-24 08:42:07 +08:00
parent 39c91a126b
commit 52be946ba3
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
View File

@ -111,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="quotJsqrCode != null and quotJsqrCode != ''"> and quot_jsqr_code like concat('%', #{quotJsqrCode}, '%')</if>
<if test="quotJsxzApprovalStatus != null and quotJsxzApprovalStatus != ''"> and q.quot_jsxz_approval_status = #{quotJsxzApprovalStatus}</if>
<if test="quotCode != null and quotCode != ''"> and q.quot_code like concat('%', #{quotCode}, '%')</if>
<if test="quotSalesmanName != null and quotSalesmanName != ''"> and q.quot_salesman_name like concat('%', #{quotSalesmanName}, '%')</if>
<if test="quotCustomerName != null and quotCustomerName != ''"> and q.quot_customer_name like concat('%', #{quotCustomerName}, '%')</if>
<if test="quotProject != null and quotProject != ''"> and q.quot_project like concat('%', #{quotProject}, '%')</if>
<!-- 数据范围过滤 -->
<!--${params.dataScope}-->
</where>

18
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -1203,12 +1203,12 @@ export default {
},
created() {
const roles = this.$store.state.user.roles;
if(roles && (roles.indexOf('QUOT') !== -1 || roles.indexOf('PRICE_VERIFICATION') !== -1)){//报价组默认查看待审核且按询价时间排序 单据
if(roles && (roles.indexOf('QUOT') !== -1 || roles.indexOf('PRICE_VERIFICATION') !== -1) && roles.indexOf('admin') == -1){//报价组默认查看待审核且按询价时间排序 单据
this.queryParams.orderByColumn = "a.quot_inquiry_date";//查询字段是表格中字段名字
this.queryParams.isAsc = "desc";//动态取值排序顺序
this.queryParams.quotApprovalStatus = '1';
}
if(roles && roles.indexOf('SALES_MAN') !== -1 ){//营销经理默认查看待提交且按创建时间排序 单据
if(roles && (roles.indexOf('SALES_MAN') !== -1 || roles.indexOf('ITZX') !== -1 || roles.indexOf('admin') !== -1)){//营销经理默认查看待提交且按创建时间排序 单据
this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字
this.queryParams.isAsc = "desc";//动态取值排序顺序
//this.queryParams.quotApprovalStatus = '0';
@ -1587,7 +1587,8 @@ export default {
/** 报价组生成报价单按钮 */
madeQuot(){
if(checkRole(['SALES_MAN'])){
const roles = this.$store.state.user.roles;
if(roles && roles.indexOf('SALES_MAN') !== -1){//业务员下载附件更新处理状态为1-已处理
// 更新报价单状态为已处理
setHandle(this.form.quotId).then(response => {
this.madeQuotFile();
@ -1868,10 +1869,15 @@ export default {
},
//下载反馈附件
downloadFkFile(fileUrl){
// 更新报价单状态为已处理
setHandle(this.form.quotId).then(response => {
const roles = this.$store.state.user.roles;
if(roles && roles.indexOf('SALES_MAN') !== -1){//业务员下载附件更新处理状态为1-已处理
// 更新报价单状态为已处理
setHandle(this.form.quotId).then(response => {
window.open(fileUrl, "_blank");
})
}else{
window.open(fileUrl, "_blank");
})
}
},
//删除附件

24
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
View File

@ -27,6 +27,30 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="业务员" prop="quotSalesmanName">
<el-input
v-model="queryParams.quotSalesmanName"
placeholder="请输入业务员"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="客户" prop="quotCustomerName">
<el-input
v-model="queryParams.quotCustomerName"
placeholder="请输入客户"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目" prop="quotProject">
<el-input
v-model="queryParams.quotProject"
placeholder="请输入项目"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>