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

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="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="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="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}--> <!--${params.dataScope}-->
</where> </where>

View File

@ -1203,12 +1203,12 @@ export default {
}, },
created() { created() {
const roles = this.$store.state.user.roles; 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.orderByColumn = "a.quot_inquiry_date";//
this.queryParams.isAsc = "desc";// this.queryParams.isAsc = "desc";//
this.queryParams.quotApprovalStatus = '1'; 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.orderByColumn = "a.create_time";//
this.queryParams.isAsc = "desc";// this.queryParams.isAsc = "desc";//
//this.queryParams.quotApprovalStatus = '0'; //this.queryParams.quotApprovalStatus = '0';
@ -1587,7 +1587,8 @@ export default {
/** 报价组生成报价单按钮 */ /** 报价组生成报价单按钮 */
madeQuot(){ 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 => { setHandle(this.form.quotId).then(response => {
this.madeQuotFile(); this.madeQuotFile();
@ -1868,10 +1869,15 @@ export default {
}, },
// //
downloadFkFile(fileUrl){ downloadFkFile(fileUrl){
// const roles = this.$store.state.user.roles;
setHandle(this.form.quotId).then(response => { if(roles && roles.indexOf('SALES_MAN') !== -1){//1-
//
setHandle(this.form.quotId).then(response => {
window.open(fileUrl, "_blank");
})
}else{
window.open(fileUrl, "_blank"); window.open(fileUrl, "_blank");
}) }
}, },
// //

View File

@ -27,6 +27,30 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </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-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <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> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>