'222222'
This commit is contained in:
parent
cef262f8da
commit
39c91a126b
|
@ -887,6 +887,21 @@ public class QuotController extends BaseController
|
||||||
return success();
|
return success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载反馈附件-更新报价单状态为已处理
|
||||||
|
*/
|
||||||
|
@PostMapping("/setHandle")
|
||||||
|
public AjaxResult setHandle(Quot quot) {
|
||||||
|
String quotId = quot.getQuotId();
|
||||||
|
try {
|
||||||
|
quotService.setHandle(quotId);
|
||||||
|
}catch(Exception e){
|
||||||
|
return error("系统异常!");
|
||||||
|
}
|
||||||
|
return success();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计有效报价单模块-获取报价单数据
|
* 统计有效报价单模块-获取报价单数据
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -119,6 +119,9 @@ public class Quot extends BaseEntity
|
||||||
/** 创建人 */
|
/** 创建人 */
|
||||||
private String createName;
|
private String createName;
|
||||||
|
|
||||||
|
/** 营销经理下载反馈附件情况 */
|
||||||
|
private String quotHandle;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/** 技术协助 */
|
/** 技术协助 */
|
||||||
|
@ -364,6 +367,9 @@ public class Quot extends BaseEntity
|
||||||
public String getCreateName() {return createName;}
|
public String getCreateName() {return createName;}
|
||||||
|
|
||||||
public void setCreateName(String createName) {this.createName = createName;}
|
public void setCreateName(String createName) {this.createName = createName;}
|
||||||
|
public String getQuotHandle() { return quotHandle; }
|
||||||
|
|
||||||
|
public void setQuotHandle(String quotHandle) { this.quotHandle = quotHandle; }
|
||||||
public List<QuotMaterial> getQuotMaterialList() { return quotMaterialList; }
|
public List<QuotMaterial> getQuotMaterialList() { return quotMaterialList; }
|
||||||
|
|
||||||
public void setQuotMaterialList(List<QuotMaterial> quotMaterialList)
|
public void setQuotMaterialList(List<QuotMaterial> quotMaterialList)
|
||||||
|
|
|
@ -148,6 +148,11 @@ public interface QuotMapper
|
||||||
*/
|
*/
|
||||||
String getCode(String type);
|
String getCode(String type);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载反馈附件-更新报价单状态为已处理
|
||||||
|
* @param quotId
|
||||||
|
*/
|
||||||
|
void setHandle(String quotId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计有效报价单模块-获取报价单数据
|
* 统计有效报价单模块-获取报价单数据
|
||||||
|
@ -155,4 +160,5 @@ public interface QuotMapper
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<Quot> selectStatisticsQuotList(Quot quot);
|
List<Quot> selectStatisticsQuotList(Quot quot);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -131,6 +131,11 @@ public interface IQuotService
|
||||||
*/
|
*/
|
||||||
void updateQuotAllPassInfo(Quot quot);
|
void updateQuotAllPassInfo(Quot quot);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载反馈附件-更新报价单状态为已处理
|
||||||
|
* @param quotId
|
||||||
|
*/
|
||||||
|
void setHandle(String quotId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计有效报价单模块-获取报价单数据
|
* 统计有效报价单模块-获取报价单数据
|
||||||
|
|
|
@ -279,6 +279,14 @@ public class QuotServiceImpl implements IQuotService
|
||||||
quotMapper.updateQuot(quot);
|
quotMapper.updateQuot(quot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载反馈附件-更新报价单状态为已处理
|
||||||
|
* @param quotId
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void setHandle(String quotId) {
|
||||||
|
quotMapper.setHandle(quotId);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计有效报价单模块-获取报价单数据
|
* 统计有效报价单模块-获取报价单数据
|
||||||
|
|
|
@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
<result property="updateTime" column="update_time" />
|
<result property="updateTime" column="update_time" />
|
||||||
|
<result property="quotHandle" column="quot_handle" />
|
||||||
|
|
||||||
<result property="quotJsxzStandard" column="quot_jsxz_standard" />
|
<result property="quotJsxzStandard" column="quot_jsxz_standard" />
|
||||||
<result property="quotJsxzApprovalStatus" column="quot_jsxz_approval_status" />
|
<result property="quotJsxzApprovalStatus" column="quot_jsxz_approval_status" />
|
||||||
|
@ -115,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
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_matprice_diff2,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_handle,
|
||||||
|
|
||||||
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,
|
||||||
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
||||||
|
@ -161,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
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_matprice_diff2,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_handle,
|
||||||
|
|
||||||
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,
|
||||||
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
a.quot_jsxz_technical_requirement,a.quot_jsxz_group_values,a.quot_jsxz_confirm_id,
|
||||||
|
@ -513,7 +514,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
{call GetSerialNo(#{type,mode=IN,jdbcType=VARCHAR})}
|
{call GetSerialNo(#{type,mode=IN,jdbcType=VARCHAR})}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<update id="setHandle" parameterType="String">
|
||||||
|
update quot set quot_handle = '1' where quot_id = #{quotId}
|
||||||
|
</update>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -176,6 +176,15 @@ export function rejectQuot(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//下载反馈附件-更新报价单状态为已处理
|
||||||
|
export function setHandle(quotId) {
|
||||||
|
return request({
|
||||||
|
url: '/quot/quot/setHandle',
|
||||||
|
method: 'post',
|
||||||
|
params: {quotId:quotId}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//统计有效报价单模块-获取报价单数据
|
//统计有效报价单模块-获取报价单数据
|
||||||
|
|
|
@ -161,6 +161,11 @@
|
||||||
<dict-tag :options="dict.type.quot_approval_status" :value="scope.row.quotApprovalStatus"/>
|
<dict-tag :options="dict.type.quot_approval_status" :value="scope.row.quotApprovalStatus"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
<el-table-column label="处理状态" align="center" prop="quotHandle" v-if="checkRole(['SALES_MAN'])">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
<dict-tag :options="dict.type.quot_fkfile_handle" :value="scope.row.quotHandle"/>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
<el-table-column label="是否打印" align="center" prop="quotPrint" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')">
|
<el-table-column label="是否打印" align="center" prop="quotPrint" v-if="$auth.hasPermi('quot:quot:changQuotPrintStatus')">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-switch
|
<el-switch
|
||||||
|
@ -614,7 +619,7 @@
|
||||||
<el-table-column width="150px" label="操作">
|
<el-table-column width="150px" label="操作">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button size="small" type="text">
|
<el-button size="small" type="text">
|
||||||
<a @click="downloadFile(scope.row.fileUrl)">下载</a>
|
<a @click="downloadFkFile(scope.row.fileUrl)">下载</a>
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button size="small" type="text" @click="deleteFile(scope.row.fileId,'quotFkFile')" v-if="form.quotApprovalStatus == '1'">删除</el-button>
|
<el-button size="small" type="text" @click="deleteFile(scope.row.fileId,'quotFkFile')" v-if="form.quotApprovalStatus == '1'">删除</el-button>
|
||||||
</template>
|
</template>
|
||||||
|
@ -1048,7 +1053,7 @@
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
import { NumberAdd } from '@/utils/number';// 数值计算
|
import { NumberAdd } from '@/utils/number';// 数值计算
|
||||||
import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, commitOAQuot, feedbackQuot, madeQuot, rejectQuot } from "@/api/quot/quot";
|
import { changQuotPrintStatus,listQuot, getQuot, getReturnUpdateQuot,getAllPass,getAllReject, delQuot, addQuot, updateQuot, quotFileList, quotFileDelete, commitQuot, commitJsQuot, commitHjQuot, commitJswQuot, commitOAQuot, feedbackQuot, madeQuot, rejectQuot, setHandle } from "@/api/quot/quot";
|
||||||
import { getToken } from "@/utils/auth";
|
import { getToken } from "@/utils/auth";
|
||||||
import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
|
import { checkPermi,checkRole } from '@/utils/permission';// 权限判断函数
|
||||||
import { getDicts } from "@/api/system/dict/data";
|
import { getDicts } from "@/api/system/dict/data";
|
||||||
|
@ -1077,7 +1082,7 @@ export default {
|
||||||
'hjDialog': hjDialog,
|
'hjDialog': hjDialog,
|
||||||
'PeopleSelect': PeopleSelect
|
'PeopleSelect': PeopleSelect
|
||||||
},
|
},
|
||||||
dicts: ['quot_print', 'quot_approval_status','quot_jsxz_group','quot_jsxz_chapter','quot_jsxz_approval_status','quot_jsxz_standard','quot_hj_approval_status','quot_jsw_approval_status','quot_oa_approval_status'],
|
dicts: ['quot_fkfile_handle','quot_print', 'quot_approval_status','quot_jsxz_group','quot_jsxz_chapter','quot_jsxz_approval_status','quot_jsxz_standard','quot_hj_approval_status','quot_jsw_approval_status','quot_oa_approval_status'],
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
//选项卡默认
|
//选项卡默认
|
||||||
|
@ -1582,6 +1587,16 @@ export default {
|
||||||
|
|
||||||
/** 报价组生成报价单按钮 */
|
/** 报价组生成报价单按钮 */
|
||||||
madeQuot(){
|
madeQuot(){
|
||||||
|
if(checkRole(['SALES_MAN'])){
|
||||||
|
// 更新报价单状态为已处理
|
||||||
|
setHandle(this.form.quotId).then(response => {
|
||||||
|
this.madeQuotFile();
|
||||||
|
})
|
||||||
|
}else{
|
||||||
|
this.madeQuotFile();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
madeQuotFile(){
|
||||||
this.form.quotMaterialList = this.quotMaterialList;
|
this.form.quotMaterialList = this.quotMaterialList;
|
||||||
madeQuot(this.form).then(response => {
|
madeQuot(this.form).then(response => {
|
||||||
this.$modal.msgSuccess("生成报价单成功");
|
this.$modal.msgSuccess("生成报价单成功");
|
||||||
|
@ -1851,6 +1866,13 @@ export default {
|
||||||
downloadFile(fileUrl){
|
downloadFile(fileUrl){
|
||||||
window.open(fileUrl, "_blank");
|
window.open(fileUrl, "_blank");
|
||||||
},
|
},
|
||||||
|
//下载反馈附件
|
||||||
|
downloadFkFile(fileUrl){
|
||||||
|
// 更新报价单状态为已处理
|
||||||
|
setHandle(this.form.quotId).then(response => {
|
||||||
|
window.open(fileUrl, "_blank");
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
//删除附件
|
//删除附件
|
||||||
deleteFile(fileId,activeName){
|
deleteFile(fileId,activeName){
|
||||||
|
|
Loading…
Reference in New Issue