'123'
This commit is contained in:
parent
06ecd54f31
commit
53ee38de3b
|
|
@ -1,5 +1,5 @@
|
|||
#for tests only !
|
||||
#Wed May 22 11:19:09 CST 2024
|
||||
#Fri May 24 10:59:58 CST 2024
|
||||
jco.destination.pool_capacity=10
|
||||
jco.client.lang=ZH
|
||||
jco.client.ashost=172.19.0.120
|
||||
|
|
@ -7,5 +7,5 @@ jco.client.saprouter=
|
|||
jco.client.user=RFC
|
||||
jco.client.sysnr=00
|
||||
jco.destination.peak_limit=10
|
||||
jco.client.passwd=gQwxMDXz:z%]%(D`z%xN*]YwLtg])onxv2:/*QW3OBRYL2x0
|
||||
jco.client.passwd=eh#cz-.rtcXe[J,v=]]kN+:WMGkUk|l**Lw)XHiZ5XN)Zm0`
|
||||
jco.client.client=300
|
||||
|
|
|
|||
|
|
@ -86,6 +86,18 @@ public class QuotController extends BaseController
|
|||
util.exportExcel(response, list, "报价数据");
|
||||
}
|
||||
|
||||
/**
|
||||
* 报价单打印状态修改
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('quot:quot:changQuotPrintStatus')")
|
||||
@Log(title = "报价单打印状态修改", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/changQuotPrintStatus")
|
||||
public AjaxResult changQuotPrintStatus(@RequestBody Quot quot)
|
||||
{
|
||||
quot.setQuotPrintUserName(getUsername());
|
||||
return toAjax(quotService.changQuotPrintStatus(quot));
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取报价详细信息
|
||||
*/
|
||||
|
|
@ -146,6 +158,7 @@ public class QuotController extends BaseController
|
|||
quot.setQuotId(UUID.fastUUID().toString());
|
||||
quot.setQuotCode(IdUtils.createNo("BJD_",2));
|
||||
quot.setCreateBy(getUsername());
|
||||
quot.setQuotSalesmanCode(getUsername());
|
||||
quot.setUpdateBy(getUsername());
|
||||
return toAjax(quotService.insertQuot(quot));
|
||||
}
|
||||
|
|
@ -270,6 +283,7 @@ public class QuotController extends BaseController
|
|||
quot.setQuotId(UUID.fastUUID().toString());
|
||||
quot.setQuotCode(IdUtils.createNo("BJD_",2));
|
||||
quot.setCreateBy(getUsername());
|
||||
quot.setQuotSalesmanCode(getUsername());
|
||||
quotService.insertQuot(quot);
|
||||
sendNoticeToBjz(quot);
|
||||
return success();
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@ public class RedBookController extends BaseController
|
|||
* @param quot
|
||||
* @return
|
||||
*/
|
||||
@DataSource(DataSourceType.MASTER)
|
||||
/*@DataSource(DataSourceType.MASTER)
|
||||
@Log(title = "提交红本报价单", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/commitQuot")
|
||||
public AjaxResult commitQuot(HttpServletResponse response, @RequestBody OAQuot quot)
|
||||
|
|
@ -237,7 +237,7 @@ public class RedBookController extends BaseController
|
|||
quot.setUpdateBy(getUsername());
|
||||
redBookService.updateOAQuot(quot);
|
||||
return success(quot);
|
||||
}
|
||||
}*/
|
||||
/**
|
||||
* 报价单生成
|
||||
* @param quot
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ public class Quot extends BaseEntity
|
|||
@Excel(name = "报价单号")
|
||||
private String quotCode;
|
||||
|
||||
/** 业务员账号 */
|
||||
private String quotSalesmanCode;
|
||||
|
||||
/** 业务员编码 */
|
||||
private String quotSalesmanBm;
|
||||
|
||||
|
|
@ -76,6 +79,17 @@ public class Quot extends BaseEntity
|
|||
@Excel(name = "反馈说明")
|
||||
private String quotFeedbackExplanation;
|
||||
|
||||
/** 铝价 */
|
||||
private String quotLvPrice;
|
||||
|
||||
/** 铜价 */
|
||||
private String quotTongPrice;
|
||||
|
||||
/** 是否打印 */
|
||||
private String quotPrint;
|
||||
/** 打印人 */
|
||||
private String quotPrintUserName;
|
||||
|
||||
/** 总价 */
|
||||
private String quotTotalPrice;
|
||||
|
||||
|
|
@ -145,6 +159,9 @@ public class Quot extends BaseEntity
|
|||
{
|
||||
return quotCode;
|
||||
}
|
||||
public String getQuotSalesmanCode() { return quotSalesmanCode; }
|
||||
|
||||
public void setQuotSalesmanCode(String quotSalesmanCode) { this.quotSalesmanCode = quotSalesmanCode; }
|
||||
public void setQuotSalesmanBm(String quotSalesmanBm)
|
||||
{
|
||||
this.quotSalesmanBm = quotSalesmanBm;
|
||||
|
|
@ -253,6 +270,18 @@ public class Quot extends BaseEntity
|
|||
{
|
||||
return quotFeedbackExplanation;
|
||||
}
|
||||
public String getQuotLvPrice() { return quotLvPrice; }
|
||||
|
||||
public void setQuotLvPrice(String quotLvPrice) { this.quotLvPrice = quotLvPrice; }
|
||||
public String getQuotTongPrice() { return quotTongPrice; }
|
||||
|
||||
public void setQuotTongPrice(String quotTongPrice) { this.quotTongPrice = quotTongPrice; }
|
||||
public String getQuotPrint() { return quotPrint; }
|
||||
|
||||
public void setQuotPrint(String quotPrint) { this.quotPrint = quotPrint; }
|
||||
public String getQuotPrintUserName() { return quotPrintUserName; }
|
||||
|
||||
public void setQuotPrintUserName(String quotPrintUserName) { this.quotPrintUserName = quotPrintUserName; }
|
||||
public void setQuotQuantity(String quotQuantity)
|
||||
{
|
||||
this.quotQuantity = quotQuantity;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ public class QuotMaterial extends BaseEntity
|
|||
@Excel(name = "电压")
|
||||
private String matDiany;
|
||||
|
||||
/** 标准 */
|
||||
private String matStandard;
|
||||
|
||||
/** 单位 */
|
||||
@Excel(name = "单位")
|
||||
private String matDanw;
|
||||
|
|
@ -40,6 +43,10 @@ public class QuotMaterial extends BaseEntity
|
|||
@Excel(name = "数量")
|
||||
private BigDecimal matSl;
|
||||
|
||||
/** 备注 */
|
||||
@Excel(name = "备注")
|
||||
private String matRemark;
|
||||
|
||||
/** */
|
||||
private String quotId;
|
||||
|
||||
|
|
@ -88,6 +95,9 @@ public class QuotMaterial extends BaseEntity
|
|||
{
|
||||
return matDanw;
|
||||
}
|
||||
public String getMatStandard() { return matStandard; }
|
||||
|
||||
public void setMatStandard(String matStandard) { this.matStandard = matStandard; }
|
||||
public void setMatSl(BigDecimal matSl)
|
||||
{
|
||||
this.matSl = matSl;
|
||||
|
|
@ -97,6 +107,9 @@ public class QuotMaterial extends BaseEntity
|
|||
{
|
||||
return matSl;
|
||||
}
|
||||
public String getMatRemark() { return matRemark; }
|
||||
|
||||
public void setMatRemark(String matRemark) { this.matRemark = matRemark; }
|
||||
public void setQuotId(String quotId)
|
||||
{
|
||||
this.quotId = quotId;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
package com.ruoyi.quot.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.ruoyi.customer.domain.Customer;
|
||||
import com.ruoyi.quot.domain.Quot;
|
||||
|
||||
/**
|
||||
|
|
@ -72,4 +74,11 @@ public interface IQuotService
|
|||
* @return
|
||||
*/
|
||||
Quot selectQuotByQuotHjId(String quotHjId);
|
||||
|
||||
/**
|
||||
* 报价单打印状态修改
|
||||
* @param quot
|
||||
* @return
|
||||
*/
|
||||
int changQuotPrintStatus(Quot quot);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
|||
import com.ruoyi.common.annotation.DataScope;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.uuid.UUID;
|
||||
import com.ruoyi.customer.domain.Customer;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -133,6 +134,16 @@ public class QuotServiceImpl implements IQuotService
|
|||
return quotMapper.selectQuotByQuotHjId(quotHjId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 报价单打印状态修改
|
||||
* @param quot
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public int changQuotPrintStatus(Quot quot) {
|
||||
return quotMapper.updateQuot(quot);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报价单-产品信息
|
||||
*
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<resultMap type="Quot" id="QuotResult">
|
||||
<result property="quotId" column="quot_id" />
|
||||
<result property="quotCode" column="quot_code" />
|
||||
<result property="quotSalesmanCode" column="quot_salesman_code" />
|
||||
<result property="quotSalesmanBm" column="quot_salesman_bm" />
|
||||
<result property="quotSalesmanName" column="quot_salesman_name" />
|
||||
<result property="quotCustomerBm" column="quot_customer_bm" />
|
||||
|
|
@ -26,6 +27,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="quotCheckUserName" column="quot_check_user_name" />
|
||||
<result property="quotCheckUserNickname" column="quot_check_user_nickname" />
|
||||
<result property="quotApprovalStatus" column="quot_approval_status" />
|
||||
<result property="quotLvPrice" column="quot_lv_price" />
|
||||
<result property="quotTongPrice" column="quot_tong_price" />
|
||||
<result property="quotPrint" column="quot_print" />
|
||||
<result property="quotPrintUserName" column="quot_print_user_name" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createName" column="create_name" />
|
||||
<result property="createTime" column="create_time" />
|
||||
|
|
@ -66,25 +71,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="matXingh" column="sub_mat_xingh" />
|
||||
<result property="matGuig" column="sub_mat_guig" />
|
||||
<result property="matDiany" column="sub_mat_diany" />
|
||||
<result property="matStandard" column="sub_mat_standard" />
|
||||
<result property="matDanw" column="sub_mat_danw" />
|
||||
<result property="matSl" column="sub_mat_sl" />
|
||||
<result property="matRemark" column="sub_mat_remark" />
|
||||
<result property="quotId" column="sub_quot_id" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="quotJoins">
|
||||
left join sys_user u on u.user_name=a.create_by
|
||||
left join sys_user u2 on u2.user_name=a.quot_check_user_name
|
||||
left join sys_user u3 on u3.user_name=a.quot_print_user_name
|
||||
left join sys_dept d on u.dept_id = d.dept_id
|
||||
left join quot_jsqr q on q.quot_jsqr_id = a.quot_jsxz_confirm_id
|
||||
left join quot_hj h on h.quot_hj_id = a.quot_hj_id
|
||||
</sql>
|
||||
|
||||
<sql id="selectQuotVo">
|
||||
select a.quot_id, a.quot_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_bm,
|
||||
select a.quot_id, a.quot_code, a.quot_salesman_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_bm,
|
||||
a.quot_customer_name,a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address,
|
||||
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_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
|
||||
a.quot_lv_price,a.quot_tong_price,a.quot_print,u3.nick_name quot_print_user_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,
|
||||
|
|
@ -117,10 +126,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</select>
|
||||
|
||||
<select id="selectQuotByQuotId" parameterType="String" resultMap="QuotQuotMaterialResult">
|
||||
select a.quot_id, a.quot_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_name,
|
||||
select a.quot_id, a.quot_code, a.quot_salesman_code, a.quot_salesman_bm, a.quot_salesman_name, a.quot_customer_name,
|
||||
a.quot_salesman_dept_id, a.quot_salesman_dept_name, a.quot_address, 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_check_user_name, u2.nick_name quot_check_user_nickname, a.quot_approval_status,
|
||||
a.quot_lv_price,a.quot_tong_price,a.quot_print,u3.nick_name quot_print_user_name,
|
||||
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,
|
||||
|
|
@ -136,8 +146,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
h.quot_hj_remark,
|
||||
|
||||
b.mat_id as sub_mat_id, b.mat_xingh as sub_mat_xingh, b.mat_guig as sub_mat_guig,
|
||||
b.mat_diany as sub_mat_diany, b.mat_danw as sub_mat_danw, b.mat_sl as sub_mat_sl,
|
||||
b.quot_id as sub_quot_id
|
||||
b.mat_diany as sub_mat_diany, b.mat_standard as sub_mat_standard, b.mat_danw as sub_mat_danw, b.mat_sl as sub_mat_sl,
|
||||
b.mat_remark as sub_mat_remark,b.quot_id as sub_quot_id
|
||||
from quot a
|
||||
left join quot_material b on b.quot_id = a.quot_id
|
||||
<include refid="quotJoins"/>
|
||||
|
|
@ -149,6 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="quotId != null and quotId != ''">quot_id,</if>
|
||||
<if test="quotCode != null and quotCode != ''">quot_code,</if>
|
||||
<if test="quotSalesmanCode != null and quotSalesmanCode != ''">quot_salesman_code,</if>
|
||||
<if test="quotSalesmanBm != null and quotSalesmanBm != ''">quot_salesman_bm,</if>
|
||||
<if test="quotSalesmanName != null and quotSalesmanName != ''">quot_salesman_name,</if>
|
||||
<if test="quotCustomerBm != null and quotCustomerBm != ''">quot_customer_bm,</if>
|
||||
|
|
@ -167,6 +178,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotTotalPrice != null">quot_total_price,</if>
|
||||
<if test="quotCheckUserName != null">quot_check_user_name,</if>
|
||||
<if test="quotApprovalStatus != null">quot_approval_status,</if>
|
||||
<if test="quotLvPrice != null">quot_lv_price,</if>
|
||||
<if test="quotTongPrice != null">quot_tong_price,</if>
|
||||
<if test="quotPrint != null">quot_print,</if>
|
||||
<if test="quotPrintUserName != null">quot_print_user_name,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
|
|
@ -185,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="quotId != null and quotId != ''">#{quotId},</if>
|
||||
<if test="quotCode != null and quotCode != ''">#{quotCode},</if>
|
||||
<if test="quotSalesmanCode != null and quotSalesmanCode != ''">#{quotSalesmanCode},</if>
|
||||
<if test="quotSalesmanBm != null and quotSalesmanBm != ''">#{quotSalesmanBm},</if>
|
||||
<if test="quotSalesmanName != null and quotSalesmanName != ''">#{quotSalesmanName},</if>
|
||||
<if test="quotCustomerBm != null and quotCustomerBm != ''">#{quotCustomerBm},</if>
|
||||
|
|
@ -203,6 +219,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotTotalPrice != null">#{quotTotalPrice},</if>
|
||||
<if test="quotCheckUserName != null">#{quotCheckUserName},</if>
|
||||
<if test="quotApprovalStatus != null">#{quotApprovalStatus},</if>
|
||||
<if test="quotLvPrice != null">#{quotLvPrice},</if>
|
||||
<if test="quotTongPrice != null">#{quotTongPrice},</if>
|
||||
<if test="quotPrint != null">#{quotPrint},</if>
|
||||
<if test="quotPrintUserName != null">#{quotPrintUserName},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
|
|
@ -224,6 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
update quot
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="quotCode != null and quotCode != ''">quot_code = #{quotCode},</if>
|
||||
<if test="quotSalesmanCode != null and quotSalesmanCode != ''">quot_salesman_code = #{quotSalesmanCode},</if>
|
||||
<if test="quotSalesmanBm != null and quotSalesmanBm != ''">quot_salesman_bm = #{quotSalesmanBm},</if>
|
||||
<if test="quotSalesmanName != null and quotSalesmanName != ''">quot_salesman_name = #{quotSalesmanName},</if>
|
||||
<if test="quotCustomerBm != null and quotCustomerBm != ''">quot_customer_bm = #{quotCustomerBm},</if>
|
||||
|
|
@ -242,6 +263,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="quotTotalPrice != null">quot_total_price = #{quotTotalPrice},</if>
|
||||
<if test="quotCheckUserName != null">quot_check_user_name = #{quotCheckUserName},</if>
|
||||
<if test="quotApprovalStatus != null">quot_approval_status = #{quotApprovalStatus},</if>
|
||||
<if test="quotLvPrice != null">quot_lv_price = #{quotLvPrice},</if>
|
||||
<if test="quotTongPrice != null">quot_tong_price = #{quotTongPrice},</if>
|
||||
<if test="quotPrint != null">quot_print = #{quotPrint},</if>
|
||||
<if test="quotPrintUserName != null">quot_print_user_name = #{quotPrintUserName},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
|
|
@ -283,9 +308,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</delete>
|
||||
|
||||
<insert id="batchQuotMaterial">
|
||||
insert into quot_material( mat_id, mat_xingh, mat_guig, mat_diany, mat_danw, mat_sl, quot_id) values
|
||||
insert into quot_material( mat_id, mat_xingh, mat_guig, mat_diany,mat_standard, mat_danw, mat_sl,mat_remark, quot_id) values
|
||||
<foreach item="item" index="index" collection="list" separator=",">
|
||||
( #{item.matId}, #{item.matXingh}, #{item.matGuig}, #{item.matDiany}, #{item.matDanw}, cast(#{item.matSl,jdbcType=DECIMAL} as decimal(18,3)), #{item.quotId})
|
||||
( #{item.matId}, #{item.matXingh}, #{item.matGuig}, #{item.matDiany}, #{item.matStandard}, #{item.matDanw}, cast(#{item.matSl,jdbcType=DECIMAL} as decimal(18,3)),#{item.matRemark}, #{item.quotId})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,18 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
// 打印状态修改
|
||||
export function changQuotPrintStatus(quotId, quotPrint) {
|
||||
const data = {
|
||||
quotId,
|
||||
quotPrint
|
||||
}
|
||||
return request({
|
||||
url: '/quot/quot/changQuotPrintStatus',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 查询报价列表
|
||||
export function listQuot(query) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -111,6 +111,17 @@
|
|||
<dict-tag :options="dict.type.quot_approval_status" :value="scope.row.quotApprovalStatus"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否打印" align="center" prop="quotPrint" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
v-model="scope.row.quotPrint"
|
||||
active-value="0"
|
||||
inactive-value="1"
|
||||
@change="handleStatusChange(scope.row)"
|
||||
></el-switch>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="打印人" align="center" prop="quotPrintUserName" 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="quotProject" width="250px"/>
|
||||
|
|
@ -264,7 +275,7 @@
|
|||
style="width:100%"
|
||||
v-model="form.quotQuotationDate"
|
||||
type="datetime"
|
||||
placeholder="报价组填写"
|
||||
placeholder="系统自动生成"
|
||||
:disabled="true">
|
||||
</el-date-picker>
|
||||
</div>
|
||||
|
|
@ -283,18 +294,39 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="总数量" prop="quotQuantity">
|
||||
<el-input v-model="form.quotQuantity"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="总价" prop="quotTotalPrice">
|
||||
<el-input v-model="form.quotTotalPrice"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div v-if="checkPermi(['quot:quot:assist'])">
|
||||
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="总数量" prop="quotQuantity">
|
||||
<el-input v-model="form.quotQuantity" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="总价" prop="quotTotalPrice">
|
||||
<el-input v-model="form.quotTotalPrice" :disabled="form.quotApprovalStatus == '2' || form.quotApprovalStatus == '3'"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div v-if="checkPermi(['quot:quot:assist'])">
|
||||
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否打印" prop="quotPrint">
|
||||
<el-switch
|
||||
v-model="form.quotPrint"
|
||||
active-value="0"
|
||||
inactive-value="1"
|
||||
:disabled="true"
|
||||
></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="打印人" prop="quotPrintUserName">
|
||||
<el-input v-model="form.quotPrintUserName" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<el-row :gutter="8" v-if="this.form.quotApprovalStatus != '0' && this.form.quotApprovalStatus != null">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="反馈说明" prop="quotFeedbackExplanation">
|
||||
|
|
@ -353,27 +385,32 @@
|
|||
<el-table-column label="序号" align="center" prop="index" width="50"/>
|
||||
<el-table-column label="型号" prop="matXingh">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.matXingh" placeholder="请输入型号" />
|
||||
<el-input v-model="scope.row.matXingh" placeholder="请输入型号" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="规格" prop="matGuig">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.matGuig" placeholder="请输入规格" />
|
||||
<el-input v-model="scope.row.matGuig" placeholder="请输入规格" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="电压" prop="matDiany">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.matDiany" placeholder="请输入电压" />
|
||||
<el-input v-model="scope.row.matDiany" placeholder="请输入电压" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单位" prop="matDanw">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.matDanw" placeholder="请输入单位" />
|
||||
<el-input v-model="scope.row.matDanw" placeholder="请输入单位" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="matSl">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.matSl" placeholder="请输入数量" />
|
||||
<el-input v-model="scope.row.matSl" placeholder="请输入数量" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" prop="matRemark">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.matRemark" placeholder="请输入备注" :disabled="form.quotApprovalStatus != '0' && form.quotApprovalStatus != null"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
@ -1324,7 +1361,7 @@
|
|||
</style>
|
||||
<script>
|
||||
import { NumberAdd } from '@/utils/number';// 数值计算
|
||||
import { listQuot, getQuot, getReturnUpdateQuot, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, feedbackQuot, rejectQuot } from "@/api/quot/quot";
|
||||
import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, feedbackQuot, rejectQuot } from "@/api/quot/quot";
|
||||
import { getToken } from "@/utils/auth";
|
||||
import { checkPermi } from '@/utils/permission';// 权限判断函数
|
||||
import { getDicts } from "@/api/system/dict/data";
|
||||
|
|
@ -1465,6 +1502,18 @@ export default {
|
|||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
// 打印状态修改
|
||||
handleStatusChange(row) {
|
||||
let text = row.quotPrint === "0" ? "打印" : "取消打印";
|
||||
this.$modal.confirm('确认要"' + text + '"报价单："' + row.quotCode + '"吗？').then(function() {
|
||||
return changQuotPrintStatus(row.quotId, row.quotPrint);
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(text + "成功");
|
||||
}).catch(function() {
|
||||
row.quotPrint = row.quotPrint === "0" ? "1" : "0";
|
||||
});
|
||||
},
|
||||
|
||||
//打开客户选择弹窗
|
||||
openCustomer(){
|
||||
this.customerOpen=true;
|
||||
|
|
|
|||
|
|
@ -147,9 +147,9 @@
|
|||
<el-table-column label="总价" align="center" prop="allPrice"/>
|
||||
</el-table>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer" v-if="this.form.quotApprovalStatus==0">
|
||||
<!--<div slot="footer" class="dialog-footer" v-if="this.form.quotApprovalStatus==0">
|
||||
<el-button type="primary" @click="handleCommitClick">提交报价</el-button>
|
||||
</div>
|
||||
</div>-->
|
||||
</el-dialog>
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
|
|
@ -389,7 +389,7 @@
|
|||
},
|
||||
|
||||
// 报价单提交报价组
|
||||
handleCommitClick() {
|
||||
/*handleCommitClick() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
const allPrice = this.selectedResultData.reduce((sum, row) => sum + parseFloat(row.allPrice), 0);
|
||||
|
|
@ -402,7 +402,7 @@
|
|||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
},*/
|
||||
|
||||
// 报价单生成
|
||||
handleMadeQuotClick() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue