From 52be946ba394a8613662bc80c84859c1a07ba220 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Mon, 24 Jun 2024 08:42:07 +0800
Subject: [PATCH] '123'
---
.../technicalConfirm/QuotJsqrMapper.xml | 3 +++
ruoyi-ui/src/views/quot/quot/index.vue | 18 +++++++++-----
.../technicalConfirm/index.vue | 24 +++++++++++++++++++
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
index 0054bf5..945c92e 100644
--- a/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
@@ -111,6 +111,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and quot_jsqr_code like concat('%', #{quotJsqrCode}, '%')
and q.quot_jsxz_approval_status = #{quotJsxzApprovalStatus}
and q.quot_code like concat('%', #{quotCode}, '%')
+ and q.quot_salesman_name like concat('%', #{quotSalesmanName}, '%')
+ and q.quot_customer_name like concat('%', #{quotCustomerName}, '%')
+ and q.quot_project like concat('%', #{quotProject}, '%')
diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue
index f63c238..ce114e1 100644
--- a/ruoyi-ui/src/views/quot/quot/index.vue
+++ b/ruoyi-ui/src/views/quot/quot/index.vue
@@ -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");
- })
+ }
},
//删除附件
diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
index 117a713..8b626d9 100644
--- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
+++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
@@ -27,6 +27,30 @@
@keyup.enter.native="handleQuery"
/>
+
+
+
+
+
+
+
+
+
搜索
重置