diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index faf6de8..239e0f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -158,7 +158,7 @@ public class QuotController extends BaseController /** * 查询附件列表 */ - @PreAuthorize("@ss.hasPermi('quot:quot:list')") + @PreAuthorize("@ss.hasAnyPermi('quot:quot:list,jsqr:jsqr:list')") @GetMapping("/quotFileList") public TableDataInfo quotFileList(QuotFile quotFile) { @@ -226,6 +226,21 @@ public class QuotController extends BaseController String quotJsqrId = UUID.fastUUID().toString(); quotJsqr.setQuotJsqrId(quotJsqrId); quotJsqr.setQuotJsqrCode(IdUtils.createNo("BJD_JSQR_",2)); + + //特缆、低压、中压、其他 协助状态设置 + if(quotJsxzGroup.indexOf("TL")!=-1){ + quotJsqr.setQuotJsqrTlApprovalStatus("1"); + } + if(quotJsxzGroup.indexOf("DY")!=-1){ + quotJsqr.setQuotJsqrDyApprovalStatus("1"); + } + if(quotJsxzGroup.indexOf("ZY")!=-1){ + quotJsqr.setQuotJsqrZyApprovalStatus("1"); + } + if(quotJsxzGroup.indexOf("QT")!=-1){ + quotJsqr.setQuotJsqrQtApprovalStatus("1"); + } + quotJsqr.setCreateBy(getUsername()); quotJsqrService.insertQuotJsqr(quotJsqr); diff --git a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java index 8b25ec8..778e1f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/quot/domain/Quot.java @@ -104,7 +104,7 @@ public class Quot extends BaseEntity private String quotJsxzTechnicalRequirement;//技术协助-技术要求 private String quotJsxzGroup;//技术协助-分组 private String quotJsxzConfirmId;//技术协助-技术确认单id - + private String quotJsxzConfirmCode;//技术协助-技术确认单号 private String quotJsqrTlApprovalStatus;//技术协助-特缆协助状态 private String quotJsqrTlRemark;//技术协助-特缆协助说明 @@ -320,6 +320,8 @@ public class Quot extends BaseEntity public String getQuotJsxzConfirmId() { return quotJsxzConfirmId; } public void setQuotJsxzConfirmId(String quotJsxzConfirmId) { this.quotJsxzConfirmId = quotJsxzConfirmId; } + public String getQuotJsxzConfirmCode() { return quotJsxzConfirmCode; } + public void setQuotJsxzConfirmCode(String quotJsxzConfirmCode) { this.quotJsxzConfirmCode = quotJsxzConfirmCode; } public void setQuotJsxzApprovalStatus(String quotJsxzApprovalStatus) { this.quotJsxzApprovalStatus = quotJsxzApprovalStatus; } public String getQuotJsqrTlApprovalStatus() { return quotJsqrTlApprovalStatus; } diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotJsqrMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotJsqrMapper.xml deleted file mode 100644 index 2c53865..0000000 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotJsqrMapper.xml +++ /dev/null @@ -1,286 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select quot_jsqr_id, quot_jsqr_code, quot_jsqr_tl_approval_status, quot_jsqr_tl_operate_user_name, quot_jsqr_tl_operate_status, quot_jsqr_tl_operate_time, quot_jsqr_tl_remark, quot_jsqr_tl_check_user_name, quot_jsqr_tl_check_state, quot_jsqr_tl_check_time, quot_jsqr_tl_check_remark, quot_jsqr_tl_leader_user_name, quot_jsqr_tl_leader_state, quot_jsqr_tl_leader_time, quot_jsqr_tl_leader_remark, quot_jsqr_dy_approval_status, quot_jsqr_dy_operate_user_name, quot_jsqr_dy_operate_status, quot_jsqr_dy_operate_time, quot_jsqr_dy_remark, quot_jsqr_dy_check_user_name, quot_jsqr_dy_check_state, quot_jsqr_dy_check_time, quot_jsqr_dy_check_remark, quot_jsqr_dy_leader_user_name, quot_jsqr_dy_leader_state, quot_jsqr_dy_leader_time, quot_jsqr_dy_leader_remark, quot_jsqr_zy_approval_status, quot_jsqr_zy_operate_user_name, quot_jsqr_zy_operate_status, quot_jsqr_zy_operate_time, quot_jsqr_zy_remark, quot_jsqr_zy_check_user_name, quot_jsqr_zy_check_state, quot_jsqr_zy_check_time, quot_jsqr_zy_check_remark, quot_jsqr_zy_leader_user_name, quot_jsqr_zy_leader_state, quot_jsqr_zy_leader_time, quot_jsqr_zy_leader_remark, quot_jsqr_qt_approval_status, quot_jsqr_qt_operate_user_name, quot_jsqr_qt_operate_status, quot_jsqr_qt_operate_time, quot_jsqr_qt_remark, quot_jsqr_qt_check_user_name, quot_jsqr_qt_check_state, quot_jsqr_qt_check_time, quot_jsqr_qt_check_remark, quot_jsqr_qt_leader_user_name, quot_jsqr_qt_leader_state, quot_jsqr_qt_leader_time, quot_jsqr_qt_leader_remark, create_by, create_time, update_by, update_time from quot_jsqr - - - - - - - - insert into quot_jsqr - - quot_jsqr_id, - quot_jsqr_code, - quot_jsqr_tl_approval_status, - quot_jsqr_tl_operate_user_name, - quot_jsqr_tl_operate_status, - quot_jsqr_tl_operate_time, - quot_jsqr_tl_remark, - quot_jsqr_tl_check_user_name, - quot_jsqr_tl_check_state, - quot_jsqr_tl_check_time, - quot_jsqr_tl_check_remark, - quot_jsqr_tl_leader_user_name, - quot_jsqr_tl_leader_state, - quot_jsqr_tl_leader_time, - quot_jsqr_tl_leader_remark, - quot_jsqr_dy_approval_status, - quot_jsqr_dy_operate_user_name, - quot_jsqr_dy_operate_status, - quot_jsqr_dy_operate_time, - quot_jsqr_dy_remark, - quot_jsqr_dy_check_user_name, - quot_jsqr_dy_check_state, - quot_jsqr_dy_check_time, - quot_jsqr_dy_check_remark, - quot_jsqr_dy_leader_user_name, - quot_jsqr_dy_leader_state, - quot_jsqr_dy_leader_time, - quot_jsqr_dy_leader_remark, - quot_jsqr_zy_approval_status, - quot_jsqr_zy_operate_user_name, - quot_jsqr_zy_operate_status, - quot_jsqr_zy_operate_time, - quot_jsqr_zy_remark, - quot_jsqr_zy_check_user_name, - quot_jsqr_zy_check_state, - quot_jsqr_zy_check_time, - quot_jsqr_zy_check_remark, - quot_jsqr_zy_leader_user_name, - quot_jsqr_zy_leader_state, - quot_jsqr_zy_leader_time, - quot_jsqr_zy_leader_remark, - quot_jsqr_qt_approval_status, - quot_jsqr_qt_operate_user_name, - quot_jsqr_qt_operate_status, - quot_jsqr_qt_operate_time, - quot_jsqr_qt_remark, - quot_jsqr_qt_check_user_name, - quot_jsqr_qt_check_state, - quot_jsqr_qt_check_time, - quot_jsqr_qt_check_remark, - quot_jsqr_qt_leader_user_name, - quot_jsqr_qt_leader_state, - quot_jsqr_qt_leader_time, - quot_jsqr_qt_leader_remark, - create_by, - create_time, - update_by, - update_time, - - - #{quotJsqrId}, - #{quotJsqrCode}, - #{quotJsqrTlApprovalStatus}, - #{quotJsqrTlOperateUserName}, - #{quotJsqrTlOperateStatus}, - #{quotJsqrTlOperateTime}, - #{quotJsqrTlRemark}, - #{quotJsqrTlCheckUserName}, - #{quotJsqrTlCheckState}, - #{quotJsqrTlCheckTime}, - #{quotJsqrTlCheckRemark}, - #{quotJsqrTlLeaderUserName}, - #{quotJsqrTlLeaderState}, - #{quotJsqrTlLeaderTime}, - #{quotJsqrTlLeaderRemark}, - #{quotJsqrDyApprovalStatus}, - #{quotJsqrDyOperateUserName}, - #{quotJsqrDyOperateStatus}, - #{quotJsqrDyOperateTime}, - #{quotJsqrDyRemark}, - #{quotJsqrDyCheckUserName}, - #{quotJsqrDyCheckState}, - #{quotJsqrDyCheckTime}, - #{quotJsqrDyCheckRemark}, - #{quotJsqrDyLeaderUserName}, - #{quotJsqrDyLeaderState}, - #{quotJsqrDyLeaderTime}, - #{quotJsqrDyLeaderRemark}, - #{quotJsqrZyApprovalStatus}, - #{quotJsqrZyOperateUserName}, - #{quotJsqrZyOperateStatus}, - #{quotJsqrZyOperateTime}, - #{quotJsqrZyRemark}, - #{quotJsqrZyCheckUserName}, - #{quotJsqrZyCheckState}, - #{quotJsqrZyCheckTime}, - #{quotJsqrZyCheckRemark}, - #{quotJsqrZyLeaderUserName}, - #{quotJsqrZyLeaderState}, - #{quotJsqrZyLeaderTime}, - #{quotJsqrZyLeaderRemark}, - #{quotJsqrQtApprovalStatus}, - #{quotJsqrQtOperateUserName}, - #{quotJsqrQtOperateStatus}, - #{quotJsqrQtOperateTime}, - #{quotJsqrQtRemark}, - #{quotJsqrQtCheckUserName}, - #{quotJsqrQtCheckState}, - #{quotJsqrQtCheckTime}, - #{quotJsqrQtCheckRemark}, - #{quotJsqrQtLeaderUserName}, - #{quotJsqrQtLeaderState}, - #{quotJsqrQtLeaderTime}, - #{quotJsqrQtLeaderRemark}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - - - - - update quot_jsqr - - quot_jsqr_code = #{quotJsqrCode}, - quot_jsqr_tl_approval_status = #{quotJsqrTlApprovalStatus}, - quot_jsqr_tl_operate_user_name = #{quotJsqrTlOperateUserName}, - quot_jsqr_tl_operate_status = #{quotJsqrTlOperateStatus}, - quot_jsqr_tl_operate_time = #{quotJsqrTlOperateTime}, - quot_jsqr_tl_remark = #{quotJsqrTlRemark}, - quot_jsqr_tl_check_user_name = #{quotJsqrTlCheckUserName}, - quot_jsqr_tl_check_state = #{quotJsqrTlCheckState}, - quot_jsqr_tl_check_time = #{quotJsqrTlCheckTime}, - quot_jsqr_tl_check_remark = #{quotJsqrTlCheckRemark}, - quot_jsqr_tl_leader_user_name = #{quotJsqrTlLeaderUserName}, - quot_jsqr_tl_leader_state = #{quotJsqrTlLeaderState}, - quot_jsqr_tl_leader_time = #{quotJsqrTlLeaderTime}, - quot_jsqr_tl_leader_remark = #{quotJsqrTlLeaderRemark}, - quot_jsqr_dy_approval_status = #{quotJsqrDyApprovalStatus}, - quot_jsqr_dy_operate_user_name = #{quotJsqrDyOperateUserName}, - quot_jsqr_dy_operate_status = #{quotJsqrDyOperateStatus}, - quot_jsqr_dy_operate_time = #{quotJsqrDyOperateTime}, - quot_jsqr_dy_remark = #{quotJsqrDyRemark}, - quot_jsqr_dy_check_user_name = #{quotJsqrDyCheckUserName}, - quot_jsqr_dy_check_state = #{quotJsqrDyCheckState}, - quot_jsqr_dy_check_time = #{quotJsqrDyCheckTime}, - quot_jsqr_dy_check_remark = #{quotJsqrDyCheckRemark}, - quot_jsqr_dy_leader_user_name = #{quotJsqrDyLeaderUserName}, - quot_jsqr_dy_leader_state = #{quotJsqrDyLeaderState}, - quot_jsqr_dy_leader_time = #{quotJsqrDyLeaderTime}, - quot_jsqr_dy_leader_remark = #{quotJsqrDyLeaderRemark}, - quot_jsqr_zy_approval_status = #{quotJsqrZyApprovalStatus}, - quot_jsqr_zy_operate_user_name = #{quotJsqrZyOperateUserName}, - quot_jsqr_zy_operate_status = #{quotJsqrZyOperateStatus}, - quot_jsqr_zy_operate_time = #{quotJsqrZyOperateTime}, - quot_jsqr_zy_remark = #{quotJsqrZyRemark}, - quot_jsqr_zy_check_user_name = #{quotJsqrZyCheckUserName}, - quot_jsqr_zy_check_state = #{quotJsqrZyCheckState}, - quot_jsqr_zy_check_time = #{quotJsqrZyCheckTime}, - quot_jsqr_zy_check_remark = #{quotJsqrZyCheckRemark}, - quot_jsqr_zy_leader_user_name = #{quotJsqrZyLeaderUserName}, - quot_jsqr_zy_leader_state = #{quotJsqrZyLeaderState}, - quot_jsqr_zy_leader_time = #{quotJsqrZyLeaderTime}, - quot_jsqr_zy_leader_remark = #{quotJsqrZyLeaderRemark}, - quot_jsqr_qt_approval_status = #{quotJsqrQtApprovalStatus}, - quot_jsqr_qt_operate_user_name = #{quotJsqrQtOperateUserName}, - quot_jsqr_qt_operate_status = #{quotJsqrQtOperateStatus}, - quot_jsqr_qt_operate_time = #{quotJsqrQtOperateTime}, - quot_jsqr_qt_remark = #{quotJsqrQtRemark}, - quot_jsqr_qt_check_user_name = #{quotJsqrQtCheckUserName}, - quot_jsqr_qt_check_state = #{quotJsqrQtCheckState}, - quot_jsqr_qt_check_time = #{quotJsqrQtCheckTime}, - quot_jsqr_qt_check_remark = #{quotJsqrQtCheckRemark}, - quot_jsqr_qt_leader_user_name = #{quotJsqrQtLeaderUserName}, - quot_jsqr_qt_leader_state = #{quotJsqrQtLeaderState}, - quot_jsqr_qt_leader_time = #{quotJsqrQtLeaderTime}, - quot_jsqr_qt_leader_remark = #{quotJsqrQtLeaderRemark}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where quot_jsqr_id = #{quotJsqrId} - - - - delete from quot_jsqr where quot_jsqr_id = #{quotJsqrId} - - - - delete from quot_jsqr where quot_jsqr_id in - - #{quotJsqrId} - - - diff --git a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml index 0cb8840..e9dc09b 100644 --- a/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/quot/QuotMapper.xml @@ -38,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user u on u.user_name=a.create_by 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 @@ -68,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 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_technical_requirement,a.quot_jsxz_group,a.quot_jsxz_confirm_id + a.quot_jsxz_technical_requirement,a.quot_jsxz_group,a.quot_jsxz_confirm_id,q.quot_jsqr_code quot_jsxz_confirm_code from quot a @@ -92,13 +95,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.quot_quantity, a.quot_total_price, a.quot_check_user_name, a.quot_check_user_nickname, a.quot_approval_status, 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_technical_requirement,a.quot_jsxz_group,a.quot_jsxz_confirm_id, + a.quot_jsxz_technical_requirement,a.quot_jsxz_group,a.quot_jsxz_confirm_id,q.quot_jsqr_code quot_jsxz_confirm_code, 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 from quot a left join quot_material b on b.quot_id = a.quot_id + where a.quot_id = #{quotId} diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 58b4de5..eed4a41 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -255,20 +255,20 @@ - + - - + + @@ -279,7 +279,14 @@ - + + + @@ -296,7 +303,7 @@ - + - + - + - + - + - + @@ -362,12 +369,12 @@ - + @@ -550,7 +557,7 @@ import { checkPermi } from '@/utils/permission' // 权限判断函数 export default { name: "Quot", - dicts: ['quot_approval_status','quot_jsxz_group','quot_jsxz_chapter','quot_jsxz_approval_status'], + dicts: ['quot_approval_status','quot_jsxz_group','quot_jsxz_chapter','quot_jsxz_approval_status','quot_jsxz_standard'], data() { return { //选项卡默认 @@ -706,7 +713,7 @@ export default { const quotId = row.quotId || this.ids getQuot(quotId).then(response => { this.form = response.data; - this.$set(this.form, "quotJsxzGroup", this.form.quotJsxzGroup==null?[]:this.form.quotJsxzGroup.split(',')); + this.$set(this.form, "quotJsxzGroup", this.form.quotJsxzGroup==''?[]:this.form.quotJsxzGroup.split(',')); this.quotMaterialList = response.data.quotMaterialList; this.open = true; this.title = "修改报价"; diff --git a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue index 4f028fc..7e6ea9a 100644 --- a/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue +++ b/ruoyi-ui/src/views/technicalConfirm/technicalConfirm/index.vue @@ -87,27 +87,48 @@ - + + + - + - + + + - + - + + + + - + - + @@ -127,349 +148,379 @@ - 特缆协助 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 技术规范要求 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + +
+ 特缆协助 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 低压协助 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ 低压协助 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 中压协助 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ 中压协助 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 其他协助 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ 其他协助 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
确 定 @@ -492,10 +543,11 @@