xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'123'

This commit is contained in:
xd 2024-06-20 13:52:29 +08:00
parent e035ed5ddb
commit e4cb8bad7c
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java
View File

@ -637,6 +637,7 @@ public class QuotController extends BaseController
quotJswInfo.setKh(quot.getQuotCustomerName()); quotJswInfo.setKh(quot.getQuotCustomerName());
quotJswInfo.setKhid(quot.getQuotCustomerBm()); quotJswInfo.setKhid(quot.getQuotCustomerBm());
quotJswInfo.setBz(quot.getQuotQuotationRequire()); quotJswInfo.setBz(quot.getQuotQuotationRequire());
quotJswInfo.setQuotUserId(getUsername());
List<QuotJswMaterial> quotJswMaterials = new ArrayList<>(); List<QuotJswMaterial> quotJswMaterials = new ArrayList<>();
QuotJswMaterial quotJswMaterial = null; QuotJswMaterial quotJswMaterial = null;

19
ruoyi-system/src/main/java/com/ruoyi/quot/domain/jsw/QuotJswInfo.java
View File

@ -6,13 +6,14 @@ import java.util.List;
* 金思维 上传报价单主体信息 * 金思维 上传报价单主体信息
*/ */
public class QuotJswInfo { public class QuotJswInfo {
private String quotCode; private String quotCode;//客户报价单号
private String xsy; private String xsy;//业务员名称
private String xsyid; private String xsyid;//业务员编码
private String kh; private String kh;//客户名称
private String khid; private String khid;//客户编码
private String xm; private String xm;//项目名称
private String bz; private String bz;//报价要求
private String quotUserId;//报价员账户
private List<QuotJswMaterial> quotMaterial; private List<QuotJswMaterial> quotMaterial;
@ -72,6 +73,10 @@ public class QuotJswInfo {
this.bz = bz; this.bz = bz;
} }
public String getQuotUserId() { return quotUserId; }
public void setQuotUserId(String quotUserId) { this.quotUserId = quotUserId; }
public List<QuotJswMaterial> getQuotMaterial() { public List<QuotJswMaterial> getQuotMaterial() {
return quotMaterial; return quotMaterial;
} }

13
ruoyi-ui/src/views/quot/quot/index.vue
View File

@ -53,7 +53,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="OA提交状态" prop="quotOAApprovalStatus"> <el-form-item label="OA提交状态" prop="quotOAApprovalStatus" v-if="checkRole(['QUOT','PRICE_VERIFICATION'])">
<el-select v-model="queryParams.quotOAApprovalStatus" placeholder="请选择提交状态" clearable> <el-select v-model="queryParams.quotOAApprovalStatus" placeholder="请选择提交状态" clearable>
<el-option <el-option
v-for="dict in dict.type.quot_oa_approval_status" v-for="dict in dict.type.quot_oa_approval_status"
@ -1400,7 +1400,16 @@ export default {
setInfo(response){ setInfo(response){
this.form = response.data; this.form = response.data;
this.$set(this.form, "quotJsxzGroup", (this.form.quotJsxzGroupValues==''||this.form.quotJsxzGroupValues==null)?[]:this.form.quotJsxzGroupValues.split(',')); this.$set(this.form, "quotJsxzGroup", (this.form.quotJsxzGroupValues==''||this.form.quotJsxzGroupValues==null)?[]:this.form.quotJsxzGroupValues.split(','));
//协助中状态不显示产品信息
if(checkRole(['SALES_MAN']) && !checkRole(['admin'])){
if(this.form.quotApprovalStatus!='1'){
this.quotMaterialList = response.data.quotMaterialList; this.quotMaterialList = response.data.quotMaterialList;
}
}else{
this.quotMaterialList = response.data.quotMaterialList;
}
this.open = true; this.open = true;
this.activeName = "quotInfo"; this.activeName = "quotInfo";
@ -1705,7 +1714,7 @@ export default {
const param = {relationId:this.form.quotId,fileType:'quotFkFile'} const param = {relationId:this.form.quotId,fileType:'quotFkFile'}
//协助中状态不显示反馈附件 //协助中状态不显示反馈附件
if(checkRole(['SALES_MAN'])){ if(checkRole(['SALES_MAN']) && !checkRole(['admin'])){
if(this.form.quotApprovalStatus!='1'){ if(this.form.quotApprovalStatus!='1'){
quotFileList(param).then(response => { quotFileList(param).then(response => {
this.quotFkFileList = response.rows; this.quotFkFileList = response.rows;