'123'
This commit is contained in:
parent
3d6351b34d
commit
e035ed5ddb
|
@ -1,5 +1,5 @@
|
||||||
#for tests only !
|
#for tests only !
|
||||||
#Wed Jun 19 20:15:41 CST 2024
|
#Thu Jun 20 11:01:14 CST 2024
|
||||||
jco.destination.pool_capacity=10
|
jco.destination.pool_capacity=10
|
||||||
jco.client.lang=ZH
|
jco.client.lang=ZH
|
||||||
jco.client.ashost=172.19.0.125
|
jco.client.ashost=172.19.0.125
|
||||||
|
@ -7,5 +7,5 @@ jco.client.saprouter=
|
||||||
jco.client.user=RFC
|
jco.client.user=RFC
|
||||||
jco.client.sysnr=00
|
jco.client.sysnr=00
|
||||||
jco.destination.peak_limit=10
|
jco.destination.peak_limit=10
|
||||||
jco.client.passwd=fO[y6l4?vRT=RiyZx5)29/4S?-@n6ptS-pq0DsUMXTA4CDTk
|
jco.client.passwd=w7hAeYb,##Zc}g(emH-GJL;?*-*mA;_enm-`{=LFKC[%7:pE
|
||||||
jco.client.client=800
|
jco.client.client=800
|
||||||
|
|
|
@ -743,6 +743,26 @@ public class QuotController extends BaseController
|
||||||
sysOaQuot.setQuotLvPrice(quot.getQuotLvPrice());
|
sysOaQuot.setQuotLvPrice(quot.getQuotLvPrice());
|
||||||
sysOaQuot.setQuotTongPrice(quot.getQuotTongPrice());
|
sysOaQuot.setQuotTongPrice(quot.getQuotTongPrice());
|
||||||
sysOaQuot.setQuotMatpriceDiff(quot.getQuotMatpriceDiff());
|
sysOaQuot.setQuotMatpriceDiff(quot.getQuotMatpriceDiff());
|
||||||
|
sysOaQuot.setQuotMatpriceDiff2(quot.getQuotMatpriceDiff2());
|
||||||
|
|
||||||
|
// 上传反馈清单
|
||||||
|
QuotFile quotFile = new QuotFile();
|
||||||
|
quotFile.setRelationId(quot.getQuotId());
|
||||||
|
quotFile.setFileType("quotFkFile");
|
||||||
|
List<QuotFile> fileList = quotFileService.selectQuotFileList(quotFile);
|
||||||
|
String fileString = "";
|
||||||
|
if(fileList!=null&&fileList.size()>0){
|
||||||
|
for(QuotFile f:fileList){
|
||||||
|
String fileUrl = f.getFileUrl();
|
||||||
|
if(StringUtils.isEmpty(fileString)){
|
||||||
|
fileString = fileString+fileUrl;
|
||||||
|
}else{
|
||||||
|
fileString = fileString+","+fileUrl;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sysOaQuot.setQuotFkFile(fileString);
|
||||||
|
|
||||||
sysOaQuot.setCreateTime(DateUtils.getNowDate());
|
sysOaQuot.setCreateTime(DateUtils.getNowDate());
|
||||||
sysOaQuot.setIsFinish("0");// 报价已提交OA审批中
|
sysOaQuot.setIsFinish("0");// 报价已提交OA审批中
|
||||||
sysOaQuot.setMaterials(quot.getQuotMaterialList());
|
sysOaQuot.setMaterials(quot.getQuotMaterialList());
|
||||||
|
|
|
@ -53,14 +53,14 @@ spring:
|
||||||
url: jdbc:sqlserver://192.168.9.99:1433;DatabaseName=jn_storage
|
url: jdbc:sqlserver://192.168.9.99:1433;DatabaseName=jn_storage
|
||||||
username: sa
|
username: sa
|
||||||
password: Itcenter110-
|
password: Itcenter110-
|
||||||
order:
|
#order:
|
||||||
# 从数据源开关/默认关闭
|
# 从数据源开关/默认关闭
|
||||||
enabled: true
|
#enabled: true
|
||||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
#driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||||
# 正式数据库
|
# 正式数据库
|
||||||
url: jdbc:sqlserver://192.168.9.2:1433;DatabaseName=jn_web
|
#url: jdbc:sqlserver://192.168.9.2:1433;DatabaseName=jn_web
|
||||||
username: sa
|
#username: sa
|
||||||
password: it12345
|
#password: it12345
|
||||||
# OA数据库数据源
|
# OA数据库数据源
|
||||||
oa:
|
oa:
|
||||||
# 从数据源开关/默认关闭
|
# 从数据源开关/默认关闭
|
||||||
|
|
|
@ -93,6 +93,8 @@ public class Quot extends BaseEntity
|
||||||
|
|
||||||
/** 整单料价价差率 */
|
/** 整单料价价差率 */
|
||||||
private String quotMatpriceDiff;
|
private String quotMatpriceDiff;
|
||||||
|
/** 整单料价价差率2 */
|
||||||
|
private String quotMatpriceDiff2;
|
||||||
|
|
||||||
/** 是否打印 */
|
/** 是否打印 */
|
||||||
private String quotPrint;
|
private String quotPrint;
|
||||||
|
@ -305,6 +307,9 @@ public class Quot extends BaseEntity
|
||||||
public String getQuotMatpriceDiff() { return quotMatpriceDiff; }
|
public String getQuotMatpriceDiff() { return quotMatpriceDiff; }
|
||||||
|
|
||||||
public void setQuotMatpriceDiff(String quotMatpriceDiff) { this.quotMatpriceDiff = quotMatpriceDiff; }
|
public void setQuotMatpriceDiff(String quotMatpriceDiff) { this.quotMatpriceDiff = quotMatpriceDiff; }
|
||||||
|
public String getQuotMatpriceDiff2() { return quotMatpriceDiff2; }
|
||||||
|
|
||||||
|
public void setQuotMatpriceDiff2(String quotMatpriceDiff2) { this.quotMatpriceDiff2 = quotMatpriceDiff2; }
|
||||||
public String getQuotPrint() { return quotPrint; }
|
public String getQuotPrint() { return quotPrint; }
|
||||||
|
|
||||||
public void setQuotPrint(String quotPrint) { this.quotPrint = quotPrint; }
|
public void setQuotPrint(String quotPrint) { this.quotPrint = quotPrint; }
|
||||||
|
|
|
@ -60,6 +60,11 @@ public class SysOaQuot extends BaseEntity
|
||||||
|
|
||||||
/** 整单料价价差率 */
|
/** 整单料价价差率 */
|
||||||
private String quotMatpriceDiff;
|
private String quotMatpriceDiff;
|
||||||
|
/** 整单料价价差率2 */
|
||||||
|
private String quotMatpriceDiff2;
|
||||||
|
|
||||||
|
/** 询价单-询价清单地址 */
|
||||||
|
private String quotFkFile;
|
||||||
|
|
||||||
/** OA审批状态 */
|
/** OA审批状态 */
|
||||||
private String state;
|
private String state;
|
||||||
|
@ -191,6 +196,14 @@ public class SysOaQuot extends BaseEntity
|
||||||
this.quotMatpriceDiff = quotMatpriceDiff;
|
this.quotMatpriceDiff = quotMatpriceDiff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getQuotMatpriceDiff2() { return quotMatpriceDiff2; }
|
||||||
|
|
||||||
|
public void setQuotMatpriceDiff2(String quotMatpriceDiff2) { this.quotMatpriceDiff2 = quotMatpriceDiff2; }
|
||||||
|
|
||||||
|
public String getQuotFkFile() { return quotFkFile; }
|
||||||
|
|
||||||
|
public void setQuotFkFile(String quotFkFile) { this.quotFkFile = quotFkFile; }
|
||||||
|
|
||||||
public String getState() { return state; }
|
public String getState() { return state; }
|
||||||
|
|
||||||
public void setState(String state) { this.state = state; }
|
public void setState(String state) { this.state = state; }
|
||||||
|
|
|
@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="quotLvPrice" column="quot_lv_price" />
|
<result property="quotLvPrice" column="quot_lv_price" />
|
||||||
<result property="quotTongPrice" column="quot_tong_price" />
|
<result property="quotTongPrice" column="quot_tong_price" />
|
||||||
<result property="quotMatpriceDiff" column="quot_matprice_diff" />
|
<result property="quotMatpriceDiff" column="quot_matprice_diff" />
|
||||||
|
<result property="quotMatpriceDiff2" column="quot_matprice_diff2" />
|
||||||
<result property="quotPrint" column="quot_print" />
|
<result property="quotPrint" column="quot_print" />
|
||||||
<result property="quotPrintUserName" column="quot_print_user_name" />
|
<result property="quotPrintUserName" column="quot_print_user_name" />
|
||||||
<result property="quotPrintUserNickName" column="quot_print_user_nickName" />
|
<result property="quotPrintUserNickName" column="quot_print_user_nickName" />
|
||||||
|
@ -113,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from,
|
a.quot_phone, a.quot_inquiry_date, a.quot_project, a.quot_quotation_date, a.quot_quotation_from,
|
||||||
a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price,
|
a.quot_quotation_require, a.quot_feedback_explanation, a.quot_quantity, a.quot_total_price,
|
||||||
a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,a.quot_materials_count,
|
a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,a.quot_materials_count,
|
||||||
a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
|
a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
|
||||||
a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,
|
a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name,
|
||||||
|
|
||||||
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
|
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
|
||||||
|
@ -143,10 +144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="quotSalesmanName != null and quotSalesmanName != ''"> and quot_salesman_name like concat('%', #{quotSalesmanName}, '%')</if>
|
<if test="quotSalesmanName != null and quotSalesmanName != ''"> and quot_salesman_name like concat('%', #{quotSalesmanName}, '%')</if>
|
||||||
<if test="quotPrint != null and quotPrint != ''"> and quot_print = #{quotPrint}</if>
|
<if test="quotPrint != null and quotPrint != ''"> and quot_print = #{quotPrint}</if>
|
||||||
<if test="quotApprovalStatus != null and quotApprovalStatus != ''"> and quot_approval_status = #{quotApprovalStatus}</if>
|
<if test="quotApprovalStatus != null and quotApprovalStatus != ''"> and quot_approval_status = #{quotApprovalStatus}</if>
|
||||||
|
<if test="quotOAApprovalStatus != null and quotOAApprovalStatus != ''"> and quot_oa_approval_status = #{quotOAApprovalStatus}</if>
|
||||||
<!-- 数据范围过滤 -->
|
<!-- 数据范围过滤 -->
|
||||||
${params.dataScope}
|
${params.dataScope}
|
||||||
</where>
|
</where>
|
||||||
order by a.quot_inquiry_date desc
|
<!-- order by a.quot_inquiry_date desc -->
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectQuotListCount" resultType="String">
|
<select id="selectQuotListCount" resultType="String">
|
||||||
|
@ -158,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date,
|
a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, a.quot_contacts, a.quot_phone, a.quot_inquiry_date,
|
||||||
a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation,
|
a.quot_project, a.quot_quotation_date, a.quot_quotation_from, a.quot_quotation_require, a.quot_feedback_explanation,
|
||||||
a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
|
a.quot_quantity, a.quot_total_price, a.quot_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
|
||||||
a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
|
a.quot_materials_count,a.quot_lv_price,a.quot_tong_price,a.quot_matprice_diff,a.quot_matprice_diff2,a.quot_print,a.quot_print_user_name,u3.nick_name quot_print_user_nickName,
|
||||||
a.create_by, a.create_time, a.update_by, a.update_time,
|
a.create_by, a.create_time, a.update_by, a.update_time,
|
||||||
|
|
||||||
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
|
a.quot_jsxz_standard,a.quot_jsxz_approval_status,a.quot_jsxz_chapter,
|
||||||
|
@ -238,6 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="quotLvPrice != null and quotLvPrice != ''">quot_lv_price,</if>
|
<if test="quotLvPrice != null and quotLvPrice != ''">quot_lv_price,</if>
|
||||||
<if test="quotTongPrice != null and quotTongPrice != ''">quot_tong_price,</if>
|
<if test="quotTongPrice != null and quotTongPrice != ''">quot_tong_price,</if>
|
||||||
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">quot_matprice_diff,</if>
|
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">quot_matprice_diff,</if>
|
||||||
|
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">quot_matprice_diff2,</if>
|
||||||
<if test="quotPrint != null and quotPrint != ''">quot_print,</if>
|
<if test="quotPrint != null and quotPrint != ''">quot_print,</if>
|
||||||
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name,</if>
|
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name,</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by,</if>
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
||||||
|
@ -286,6 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="quotLvPrice != null and quotLvPrice != ''">#{quotLvPrice},</if>
|
<if test="quotLvPrice != null and quotLvPrice != ''">#{quotLvPrice},</if>
|
||||||
<if test="quotTongPrice != null and quotTongPrice != ''">#{quotTongPrice},</if>
|
<if test="quotTongPrice != null and quotTongPrice != ''">#{quotTongPrice},</if>
|
||||||
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">#{quotMatpriceDiff},</if>
|
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">#{quotMatpriceDiff},</if>
|
||||||
|
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">#{quotMatpriceDiff2},</if>
|
||||||
<if test="quotPrint != null and quotPrint != ''">#{quotPrint},</if>
|
<if test="quotPrint != null and quotPrint != ''">#{quotPrint},</if>
|
||||||
<if test="quotPrintUserName != null and quotPrintUserName != ''">#{quotPrintUserName},</if>
|
<if test="quotPrintUserName != null and quotPrintUserName != ''">#{quotPrintUserName},</if>
|
||||||
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
||||||
|
@ -330,6 +334,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="quotLvPrice != null and quotLvPrice != ''">quot_lv_price,</if>
|
<if test="quotLvPrice != null and quotLvPrice != ''">quot_lv_price,</if>
|
||||||
<if test="quotTongPrice != null and quotTongPrice != ''">quot_tong_price,</if>
|
<if test="quotTongPrice != null and quotTongPrice != ''">quot_tong_price,</if>
|
||||||
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">quot_matprice_diff,</if>
|
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">quot_matprice_diff,</if>
|
||||||
|
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">quot_matprice_diff2,</if>
|
||||||
|
<if test="quotFkFile != null and quotFkFile != ''">quot_fk_file,</if>
|
||||||
|
|
||||||
<if test="createTime != null">create_time,</if>
|
<if test="createTime != null">create_time,</if>
|
||||||
<if test="isFinish != null and isFinish != ''">isFinish,</if>
|
<if test="isFinish != null and isFinish != ''">isFinish,</if>
|
||||||
</trim>
|
</trim>
|
||||||
|
@ -349,6 +356,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="quotLvPrice != null and quotLvPrice != ''">#{quotLvPrice},</if>
|
<if test="quotLvPrice != null and quotLvPrice != ''">#{quotLvPrice},</if>
|
||||||
<if test="quotTongPrice != null and quotTongPrice != ''">#{quotTongPrice},</if>
|
<if test="quotTongPrice != null and quotTongPrice != ''">#{quotTongPrice},</if>
|
||||||
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">#{quotMatpriceDiff},</if>
|
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">#{quotMatpriceDiff},</if>
|
||||||
|
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">#{quotMatpriceDiff2},</if>
|
||||||
|
<if test="quotFkFile != null and quotFkFile != ''">#{quotFkFile},</if>
|
||||||
|
|
||||||
<if test="createTime != null">#{createTime},</if>
|
<if test="createTime != null">#{createTime},</if>
|
||||||
<if test="isFinish != null and isFinish != ''">#{isFinish},</if>
|
<if test="isFinish != null and isFinish != ''">#{isFinish},</if>
|
||||||
</trim>
|
</trim>
|
||||||
|
@ -383,6 +393,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="quotLvPrice != null and quotLvPrice != ''">quot_lv_price = #{quotLvPrice},</if>
|
<if test="quotLvPrice != null and quotLvPrice != ''">quot_lv_price = #{quotLvPrice},</if>
|
||||||
<if test="quotTongPrice != null and quotTongPrice != ''">quot_tong_price = #{quotTongPrice},</if>
|
<if test="quotTongPrice != null and quotTongPrice != ''">quot_tong_price = #{quotTongPrice},</if>
|
||||||
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">quot_matprice_diff = #{quotMatpriceDiff},</if>
|
<if test="quotMatpriceDiff != null and quotMatpriceDiff != ''">quot_matprice_diff = #{quotMatpriceDiff},</if>
|
||||||
|
<if test="quotMatpriceDiff2 != null and quotMatpriceDiff2 != ''">quot_matprice_diff2 = #{quotMatpriceDiff2},</if>
|
||||||
<if test="quotPrint != null and quotPrint != ''">quot_print = #{quotPrint},</if>
|
<if test="quotPrint != null and quotPrint != ''">quot_print = #{quotPrint},</if>
|
||||||
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name = #{quotPrintUserName},</if>
|
<if test="quotPrintUserName != null and quotPrintUserName != ''">quot_print_user_name = #{quotPrintUserName},</if>
|
||||||
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
|
||||||
<el-form-item label="询价单号" prop="quotCode">
|
<el-form-item label="询价单号" prop="quotCode">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.quotCode"
|
v-model="queryParams.quotCode"
|
||||||
|
@ -53,6 +53,16 @@
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="OA提交状态" prop="quotOAApprovalStatus">
|
||||||
|
<el-select v-model="queryParams.quotOAApprovalStatus" placeholder="请选择提交状态" clearable>
|
||||||
|
<el-option
|
||||||
|
v-for="dict in dict.type.quot_oa_approval_status"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.label"
|
||||||
|
:value="dict.value"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</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>
|
||||||
|
@ -163,15 +173,16 @@
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="打印人" align="center" prop="quotPrintUserNickName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/>
|
<el-table-column label="打印人" align="center" prop="quotPrintUserNickName" width="150px" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')"/>
|
||||||
<el-table-column label="OA提交状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
|
<el-table-column label="OA提交状态" align="center" prop="quotOAApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.quot_oa_approval_status" :value="scope.row.quotOAApprovalStatus" v-if="scope.row.quotOAApprovalStatus!=0"/>
|
<dict-tag :options="dict.type.quot_oa_approval_status" :value="scope.row.quotOAApprovalStatus" v-if="scope.row.quotOAApprovalStatus!=0"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="OA审批说明" align="center" prop="quotOAApprovalStatusRemark" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])"/>
|
||||||
<el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
|
<el-table-column label="业务员" align="center" prop="quotSalesmanName" width="150px"/>
|
||||||
<el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
|
<el-table-column label="客户名称" align="center" prop="quotCustomerName" width="250px"/>
|
||||||
<el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
|
<el-table-column label="项目名称" align="center" prop="quotProject" width="250px"/>
|
||||||
<el-table-column label="金思维提交状态" align="center" prop="quotJsxzApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
|
<el-table-column label="金思维提交状态" align="center" prop="quotJswApprovalStatus" width="150px" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.quot_jsw_approval_status" :value="scope.row.quotJswApprovalStatus" v-if="scope.row.quotJswApprovalStatus!=0"/>
|
<dict-tag :options="dict.type.quot_jsw_approval_status" :value="scope.row.quotJswApprovalStatus" v-if="scope.row.quotJswApprovalStatus!=0"/>
|
||||||
</template>
|
</template>
|
||||||
|
@ -389,6 +400,13 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
<el-row :gutter="8">
|
||||||
|
<el-col :span="6" v-if="checkRole(['QUOT','PRICE_VERIFICATION','QUOT_MAT_PRICE_DIFF'])">
|
||||||
|
<el-form-item label="整单料价价差率2" prop="quotMatpriceDiff2">
|
||||||
|
<el-input v-model="form.quotMatpriceDiff2"/>
|
||||||
|
</el-form-item>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
<el-row :gutter="8" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN'])">
|
<el-row :gutter="8" v-if="checkRole(['QUOT','PRICE_VERIFICATION','SALES_MAN'])">
|
||||||
<el-col :span="24" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
<el-col :span="24" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
||||||
<el-form-item label="反馈说明" prop="quotFeedbackExplanation">
|
<el-form-item label="反馈说明" prop="quotFeedbackExplanation">
|
||||||
|
@ -1180,8 +1198,15 @@ export default {
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
const roles = this.$store.state.user.roles;
|
const roles = this.$store.state.user.roles;
|
||||||
if(roles && roles.indexOf('QUOT') !== -1 ){//报价组默认查看待审核 单据
|
if(roles && (roles.indexOf('QUOT') !== -1 || roles.indexOf('PRICE_VERIFICATION') !== -1)){//报价组默认查看待审核且按询价时间排序 单据
|
||||||
this.queryParams.quotApprovalStatus = '1';
|
this.queryParams.orderByColumn = "a.quot_inquiry_date";//查询字段是表格中字段名字
|
||||||
|
this.queryParams.isAsc = "desc";//动态取值排序顺序
|
||||||
|
this.queryParams.quotApprovalStatus = '1';
|
||||||
|
}
|
||||||
|
if(roles && roles.indexOf('SALES_MAN') !== -1 ){//营销经理默认查看待提交且按创建时间排序 单据
|
||||||
|
this.queryParams.orderByColumn = "a.create_time";//查询字段是表格中字段名字
|
||||||
|
this.queryParams.isAsc = "desc";//动态取值排序顺序
|
||||||
|
this.queryParams.quotApprovalStatus = '0';
|
||||||
}
|
}
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
|
@ -1237,6 +1262,7 @@ export default {
|
||||||
quotTongPrice: null,
|
quotTongPrice: null,
|
||||||
quotLvPrice: null,
|
quotLvPrice: null,
|
||||||
quotMatpriceDiff: null,
|
quotMatpriceDiff: null,
|
||||||
|
quotMatpriceDiff2: null,
|
||||||
|
|
||||||
quotJsxzApprovalStatus: null,
|
quotJsxzApprovalStatus: null,
|
||||||
quotJsxzChapter: null,
|
quotJsxzChapter: null,
|
||||||
|
|
|
@ -8,11 +8,11 @@
|
||||||
<el-button style="float: right;" size="mini" type="primary" icon="el-icon-search" @click="handleSearchClick">搜索</el-button>
|
<el-button style="float: right;" size="mini" type="primary" icon="el-icon-search" @click="handleSearchClick">搜索</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="14">
|
<el-col :span="14">
|
||||||
<el-button style="float: right;margin-left: 5px;" size="mini" type="primary" icon="el-icon-document" @click="handleMadeXjQuotClick" :disabled="selectedResultData.length==0 || madeQuotDis">生成询价单</el-button>
|
|
||||||
<el-button style="float: right;margin-left: 5px;" size="mini" type="success" icon="el-icon-document" @click="handleMadeQuotClick" :disabled="selectedResultData.length==0 || madeQuotDis">生成报价单</el-button>
|
<el-button style="float: right;margin-left: 5px;" size="mini" type="success" icon="el-icon-document" @click="handleMadeQuotClick" :disabled="selectedResultData.length==0 || madeQuotDis">生成报价单</el-button>
|
||||||
<el-button style="float: right;margin-left: 5px;" size="mini" type="warning" icon="el-icon-folder" @click="handleSaveClick" :disabled="selectedResultData.length==0">保存</el-button>
|
<el-button style="float: right;margin-left: 5px;" size="mini" type="warning" icon="el-icon-folder" @click="handleSaveClick" :disabled="selectedResultData.length==0">保存</el-button>
|
||||||
<el-button style="float: right;margin-left: 5px;" size="mini" icon="el-icon-refresh" @click="handleRefreshClick">清空信息</el-button>
|
<el-button style="float: right;margin-left: 5px;" size="mini" icon="el-icon-refresh" @click="handleRefreshClick">清空信息</el-button>
|
||||||
<el-button style="float: right;" size="mini" type="info" plain icon="el-icon-upload2" @click="handleImport">导入</el-button>
|
<el-button style="float: right;" size="mini" type="info" plain icon="el-icon-upload2" @click="handleImport">导入</el-button>
|
||||||
|
<el-button style="float: right;margin-left: 5px;" size="mini" type="primary" icon="el-icon-document" @click="handleMadeXjQuotClick" :disabled="selectedResultData.length==0 || madeQuotDis">生成询价单</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue