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

'123'

This commit is contained in:
xd 2024-04-11 13:31:16 +08:00
parent ac9a1dcf13
commit 5aadb3f615
6 changed files with 74 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ruoyi-admin/src/main/java/com/ruoyi/web/controller/technicalConfirm/QuotJsqrController.java
View File

@ -123,6 +123,10 @@ public class QuotJsqrController extends BaseController
quotJsqr.setQuotJsqrTlOperateTime(DateUtils.getTime());
quotJsqr.setQuotJsqrTlOperateState(state);
if("3".equals(state)){//驳回
String quotJsqrTlRemark = info.getQuotJsqrTlRemark();
if(StringUtils.isEmpty(quotJsqrTlRemark)){
return error("特缆协助说明不能为空");
}
quotJsqr.setQuotJsqrTlApprovalStatus("3");//特缆协助状态 设置为 驳回
}
}
@ -159,6 +163,10 @@ public class QuotJsqrController extends BaseController
quotJsqr.setQuotJsqrDyOperateTime(DateUtils.getTime());
quotJsqr.setQuotJsqrDyOperateState(state);
if("3".equals(state)){//驳回
String quotJsqrDyRemark = info.getQuotJsqrDyRemark();
if(StringUtils.isEmpty(quotJsqrDyRemark)){
return error("低压协助说明不能为空");
}
quotJsqr.setQuotJsqrDyApprovalStatus("3");//低压协助状态 设置为 驳回
}
}
@ -195,6 +203,10 @@ public class QuotJsqrController extends BaseController
quotJsqr.setQuotJsqrZyOperateTime(DateUtils.getTime());
quotJsqr.setQuotJsqrZyOperateState(state);
if("3".equals(state)){//驳回
String quotJsqrZyRemark = info.getQuotJsqrZyRemark();
if(StringUtils.isEmpty(quotJsqrZyRemark)){
return error("中压协助说明不能为空");
}
quotJsqr.setQuotJsqrZyApprovalStatus("3");//中压协助状态 设置为 驳回
}
}
@ -231,6 +243,10 @@ public class QuotJsqrController extends BaseController
quotJsqr.setQuotJsqrQtOperateTime(DateUtils.getTime());
quotJsqr.setQuotJsqrQtOperateState(state);
if("3".equals(state)){//驳回
String quotJsqrQtRemark = info.getQuotJsqrQtRemark();
if(StringUtils.isEmpty(quotJsqrQtRemark)){
return error("其他协助说明不能为空");
}
quotJsqr.setQuotJsqrQtApprovalStatus("3");//其他协助状态 设置为 驳回
}
}
@ -278,9 +294,10 @@ public class QuotJsqrController extends BaseController
QuotJsqr info = quotJsqrService.selectQuotJsqrByQuotJsqrId(quotJsqrId);
Quot quot = quotService.selectQuotByQuotJsqrId(quotJsqrId);
String quot_jsxz_group = quot.getQuotJsxzGroup().toString();
String quotJsxzConfirmId = quot.getQuotJsxzConfirmId();
String quot_jsxz_group = quot.getQuotJsxzGroupValues();//技术协助单-分组
String quotJsxzConfirmId = quot.getQuotJsxzConfirmId();//技术协助单Id
if(StringUtils.isNotEmpty(quotJsxzConfirmId)){
Boolean tlFlag = true;
if(quot_jsxz_group.indexOf("TL")!=-1) {//校验特缆 操作人、审核人、组长 通过情况

10
ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqr.java
View File

@ -554,7 +554,8 @@ public class QuotJsqr extends BaseEntity
private String quotJsxzApprovalStatus;
/** 技术协助-分组 */
private String quotJsxzGroup;
private String[] quotJsxzGroup;
private String quotJsxzGroupValues;
/** 技术协助-标准 */
private String quotJsxzStandard;
@ -580,8 +581,11 @@ public class QuotJsqr extends BaseEntity
public String getQuotJsxzApprovalStatus() { return quotJsxzApprovalStatus; }
public void setQuotJsxzApprovalStatus(String quotJsxzApprovalStatus) { this.quotJsxzApprovalStatus = quotJsxzApprovalStatus; }
public String getQuotJsxzGroup() { return quotJsxzGroup; }
public void setQuotJsxzGroup(String quotJsxzGroup) { this.quotJsxzGroup = quotJsxzGroup; }
public String[] getQuotJsxzGroup() { return quotJsxzGroup; }
public void setQuotJsxzGroup(String[] quotJsxzGroup) { this.quotJsxzGroup = quotJsxzGroup; }
public String getQuotJsxzGroupValues() { return quotJsxzGroupValues; }
public void setQuotJsxzGroupValues(String quotJsxzGroupValues) { this.quotJsxzGroupValues = quotJsxzGroupValues; }
public String getQuotJsxzStandard() { return quotJsxzStandard; }
public void setQuotJsxzStandard(String quotJsxzStandard) { this.quotJsxzStandard = quotJsxzStandard; }

37
ruoyi-system/src/main/java/com/ruoyi/technicalConfirm/domain/QuotJsqrXzDetail.java
View File

@ -5,15 +5,20 @@ public class QuotJsqrXzDetail {
private String quotJsxzGroup;
private String type;
private String state;
private String quotJsqrTlRemark;
private String quotJsqrTlCheckRemark;
private String quotJsqrTlLeaderRemark;
private String quotJsqrDyRemark;
private String quotJsqrDyCheckRemark;
private String quotJsqrDyLeaderRemark;
private String quotJsqrZyRemark;
private String quotJsqrZyCheckRemark;
private String quotJsqrZyLeaderRemark;
private String quotJsqrQtRemark;
private String quotJsqrQtCheckRemark;
private String quotJsqrQtLeaderRemark;
@ -49,6 +54,14 @@ public class QuotJsqrXzDetail {
this.type = type;
}
public String getQuotJsqrTlRemark() {
return quotJsqrTlRemark;
}
public void setQuotJsqrTlRemark(String quotJsqrTlRemark) {
this.quotJsqrTlRemark = quotJsqrTlRemark;
}
public String getQuotJsqrTlCheckRemark() {
return quotJsqrTlCheckRemark;
}
@ -65,6 +78,14 @@ public class QuotJsqrXzDetail {
this.quotJsqrTlLeaderRemark = quotJsqrTlLeaderRemark;
}
public String getQuotJsqrDyRemark() {
return quotJsqrDyRemark;
}
public void setQuotJsqrDyRemark(String quotJsqrDyRemark) {
this.quotJsqrDyRemark = quotJsqrDyRemark;
}
public String getQuotJsqrDyCheckRemark() {
return quotJsqrDyCheckRemark;
}
@ -81,6 +102,14 @@ public class QuotJsqrXzDetail {
this.quotJsqrDyLeaderRemark = quotJsqrDyLeaderRemark;
}
public String getQuotJsqrZyRemark() {
return quotJsqrZyRemark;
}
public void setQuotJsqrZyRemark(String quotJsqrZyRemark) {
this.quotJsqrZyRemark = quotJsqrZyRemark;
}
public String getQuotJsqrZyCheckRemark() {
return quotJsqrZyCheckRemark;
}
@ -97,6 +126,14 @@ public class QuotJsqrXzDetail {
this.quotJsqrZyLeaderRemark = quotJsqrZyLeaderRemark;
}
public String getQuotJsqrQtRemark() {
return quotJsqrQtRemark;
}
public void setQuotJsqrQtRemark(String quotJsqrQtRemark) {
this.quotJsqrQtRemark = quotJsqrQtRemark;
}
public String getQuotJsqrQtCheckRemark() {
return quotJsqrQtCheckRemark;
}

4
ruoyi-system/src/main/resources/mapper/technicalConfirm/QuotJsqrMapper.xml
View File

@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="quotCustomerName" column="quot_customer_name" />
<result property="quotProject" column="quot_project" />
<result property="quotJsxzApprovalStatus" column="quot_jsxz_approval_status" />
<result property="quotJsxzGroup" column="quot_jsxz_group" />
<result property="quotJsxzGroupValues" column="quot_jsxz_group_values" />
<result property="quotJsxzStandard" column="quot_jsxz_standard" />
<result property="quotJsxzChapter" column="quot_jsxz_chapter" />
<result property="quotJsxzTechnicalRequirement" column="quot_jsxz_technical_requirement" />
@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.quot_jsqr_qt_check_time, a.quot_jsqr_qt_check_remark, a.quot_jsqr_qt_leader_user_name, a.quot_jsqr_qt_leader_state,
a.quot_jsqr_qt_leader_time, a.quot_jsqr_qt_leader_remark, a.create_by, a.create_time, a.update_by, a.update_time,
u.nick_name create_name,q.quot_code,q.quot_salesman_name,q.quot_customer_name,q.quot_project,
q.quot_jsxz_approval_status,q.quot_jsxz_group,q.quot_jsxz_standard,q.quot_jsxz_chapter,q.quot_jsxz_technical_requirement
q.quot_jsxz_approval_status,q.quot_jsxz_group_values,q.quot_jsxz_standard,q.quot_jsxz_chapter,q.quot_jsxz_technical_requirement
from quot_jsqr a
<include refid="quotJsqrJoins"/>
</sql>

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

@ -670,7 +670,7 @@ export default {
quotJsxzChapter: null,
quotJsxzTechnicalRequirement: null,
quotJsxzGroup: [],
quotJsxzGroupValues: []
quotJsxzGroupValues: null
};
this.quotMaterialList = [];
this.quotXjFileList = [];
@ -728,7 +728,6 @@ export default {
saveForm() {
this.$refs["form"].validate(valid => {
if (valid) {
//this.form.quotJsxzGroup = this.convertString();
this.form.quotMaterialList = this.quotMaterialList;
if (this.form.quotId != null) {
updateQuot(this.form).then(response => {
@ -750,7 +749,6 @@ export default {
commitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
//this.form.quotJsxzGroup = this.convertString();
this.form.quotMaterialList = this.quotMaterialList;
commitQuot(this.form).then(response => {
this.$modal.msgSuccess("提交成功");
@ -761,27 +759,11 @@ export default {
});
},
/** 报价单-技术协助分组 格式转换 */
convertString(){
//技术协助-分组传值
let quotJsxzGroups = '';
if(this.form.quotJsxzGroup){
this.form.quotJsxzGroup.forEach(function (item,index) {
if(index !== 0){
quotJsxzGroups+=',';
}
quotJsxzGroups+=item;
})
}
return quotJsxzGroups;
},
/** 报价组权限控制 */
checkPermi,
/** 报价组提交技术协助按钮 */
commitJsForm() {
//this.form.quotJsxzGroup = this.convertString();
this.form.quotMaterialList = this.quotMaterialList;
commitJsQuot(this.form).then(response => {
this.$modal.msgSuccess("提交技术协助成功");

23
ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue
View File

@ -34,7 +34,7 @@
</el-table-column>
<el-table-column label="技术协助分组" align="center" prop="quotJsxzGroup" width="150px">
<template slot-scope="scope">
<dict-tag :options="dict.type.quot_jsxz_group" :value="scope.row.quotJsxzGroup"/>
<dict-tag :options="dict.type.quot_jsxz_group" :value="scope.row.quotJsxzGroupValues"/>
</template>
</el-table-column>
<el-table-column label="特缆协助状态" align="center" prop="quotJsqrTlApprovalStatus" width="150px">
@ -889,8 +889,8 @@ export default {
const quotJsqrId = row.quotJsqrId || this.ids
getJsqr(quotJsqrId).then(response => {
this.form = response.data;
this.$set(this.form, "quotJsxzGroup", (this.form.quotJsxzGroup==''||this.form.quotJsxzGroup==null)?[]:this.form.quotJsxzGroup.split(','));
var quotJsxzGroup = this.form.quotJsxzGroup;
this.$set(this.form, "quotJsxzGroup", (this.form.quotJsxzGroupValues==''||this.form.quotJsxzGroupValues==null)?[]:this.form.quotJsxzGroupValues.split(','));
var quotJsxzGroup = this.form.quotJsxzGroupValues;
if(quotJsxzGroup.indexOf("TL")!==-1){
this.showTl = true;
this.getQuotJsqrFileList('quotJsqrTlFkFile');
@ -919,22 +919,10 @@ export default {
},
/** 提交按钮 */
commitQuot() {
//技术协助-分组传值
let quotJsxzGroups = '';
if(this.form.quotJsxzGroup){
this.form.quotJsxzGroup.forEach(function (item,index) {
if(index !== 0){
quotJsxzGroups+=',';
}
quotJsxzGroups+=item;
})
}
this.form.quotJsxzGroup = quotJsxzGroups;
//技术协助状态 设置为 已协助
commitQuot(this.form).then(response => {
this.open = false;
})
this.form.quotJsxzGroup = quotJsxzGroups.split(",");
},
/** 删除按钮操作 */
handleDelete(row) {
@ -1030,15 +1018,20 @@ export default {
param.quotJsxzGroup = quotJsxzGroup;//组名
param.type = type;//操作人、审核人、组长
param.state = state;//通过/驳回
param.quotJsqrTlRemark = this.form.quotJsqrTlRemark;
param.quotJsqrTlCheckRemark = this.form.quotJsqrTlCheckRemark;
param.quotJsqrTlLeaderRemark = this.form.quotJsqrTlLeaderRemark;
param.quotJsqrDyRemark = this.form.quotJsqrDyRemark;
param.quotJsqrDyCheckRemark = this.form.quotJsqrDyCheckRemark;
param.quotJsqrDyLeaderRemark = this.form.quotJsqrDyLeaderRemark;
param.quotJsqrZyRemark = this.form.quotJsqrZyRemark;
param.quotJsqrZyCheckRemark = this.form.quotJsqrZyCheckRemark;
param.quotJsqrZyLeaderRemark = this.form.quotJsqrZyLeaderRemark;
param.quotJsqrQtRemark = this.form.quotJsqrQtRemark;
param.quotJsqrQtCheckRemark = this.form.quotJsqrQtCheckRemark;
param.quotJsqrQtLeaderRemark = this.form.quotJsqrQtLeaderRemark;