diff --git a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java index fd62527..5a82c5b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java +++ b/ruoyi-system/src/main/java/com/ruoyi/priceVerification/domain/QuotHj.java @@ -47,8 +47,21 @@ public class QuotHj extends BaseEntity private String quotProject;//项目 /** 技术协助信息 */ + private String quotJsxzConfirmId;//技术协助-技术确认单id private String quotJsxzGroupValues;//技术协助-分组 + private String quotJsqrTlApprovalStatus;//技术协助-特缆协助状态 + private String quotJsqrTlRemark;//技术协助-特缆协助说明 + + private String quotJsqrDyApprovalStatus;//技术协助-低压协助状态 + private String quotJsqrDyRemark;//技术协助-低压协助说明 + + private String quotJsqrZyApprovalStatus;//技术协助-中压协助状态 + private String quotJsqrZyRemark;//技术协助-中压协助说明 + + private String quotJsqrQtApprovalStatus;//技术协助-其他协助状态 + private String quotJsqrQtRemark;//技术协助-其他协助说明 + public void setQuotHjId(String quotHjId) { this.quotHjId = quotHjId; @@ -114,6 +127,33 @@ public class QuotHj extends BaseEntity public String getQuotProject() { return quotProject; } public void setQuotProject(String quotProject) { this.quotProject = quotProject; } + public String getQuotJsxzConfirmId() { return quotJsxzConfirmId; } + public void setQuotJsxzConfirmId(String quotJsxzConfirmId) { this.quotJsxzConfirmId = quotJsxzConfirmId; } + public String getQuotJsxzGroupValues() { return quotJsxzGroupValues; } public void setQuotJsxzGroupValues(String quotJsxzGroupValues) { this.quotJsxzGroupValues = quotJsxzGroupValues; } + + public String getQuotJsqrTlApprovalStatus() { return quotJsqrTlApprovalStatus; } + public void setQuotJsqrTlApprovalStatus(String quotJsqrTlApprovalStatus) { this.quotJsqrTlApprovalStatus = quotJsqrTlApprovalStatus; } + + public String getQuotJsqrTlRemark() { return quotJsqrTlRemark; } + public void setQuotJsqrTlRemark(String quotJsqrTlRemark) { this.quotJsqrTlRemark = quotJsqrTlRemark; } + + public String getQuotJsqrDyApprovalStatus() { return quotJsqrDyApprovalStatus; } + public void setQuotJsqrDyApprovalStatus(String quotJsqrDyApprovalStatus) { this.quotJsqrDyApprovalStatus = quotJsqrDyApprovalStatus; } + + public String getQuotJsqrDyRemark() { return quotJsqrDyRemark; } + public void setQuotJsqrDyRemark(String quotJsqrDyRemark) { this.quotJsqrDyRemark = quotJsqrDyRemark; } + + public String getQuotJsqrZyApprovalStatus() { return quotJsqrZyApprovalStatus; } + public void setQuotJsqrZyApprovalStatus(String quotJsqrZyApprovalStatus) { this.quotJsqrZyApprovalStatus = quotJsqrZyApprovalStatus; } + + public String getQuotJsqrZyRemark() { return quotJsqrZyRemark; } + public void setQuotJsqrZyRemark(String quotJsqrZyRemark) { this.quotJsqrZyRemark = quotJsqrZyRemark; } + + public String getQuotJsqrQtApprovalStatus() { return quotJsqrQtApprovalStatus; } + public void setQuotJsqrQtApprovalStatus(String quotJsqrQtApprovalStatus) { this.quotJsqrQtApprovalStatus = quotJsqrQtApprovalStatus; } + + public String getQuotJsqrQtRemark() { return quotJsqrQtRemark; } + public void setQuotJsqrQtRemark(String quotJsqrQtRemark) { this.quotJsqrQtRemark = quotJsqrQtRemark; } } diff --git a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml index 00172ad..3ad3240 100644 --- a/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/priceVerification/QuotHjMapper.xml @@ -23,23 +23,37 @@ 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 q on q.quot_hj_id = a.quot_hj_id + left join quot_jsqr j on j.quot_jsqr_id = q.quot_jsxz_confirm_id select a.quot_hj_id, a.quot_hj_code, a.quot_hj_pricing_type, a.quot_hj_pricing_date, a.quot_hj_remark, a.create_by, a.create_time, a.update_by, a.update_time, u.nick_name create_name, - q.quot_hj_approval_status, - q.quot_id,q.quot_code,q.quot_salesman_name, + q.quot_hj_approval_status,q.quot_id,q.quot_code,q.quot_salesman_name, q.quot_customer_name,q.quot_project, - q.quot_jsxz_group_values + q.quot_jsxz_confirm_id,q.quot_jsxz_group_values, + j.quot_jsqr_tl_approval_status,j.quot_jsqr_tl_remark, + j.quot_jsqr_dy_approval_status,j.quot_jsqr_dy_remark, + j.quot_jsqr_zy_approval_status,j.quot_jsqr_zy_remark, + j.quot_jsqr_qt_approval_status,j.quot_jsqr_qt_remark from quot_hj a diff --git a/ruoyi-ui/src/directive/dialog/dragDialog.js b/ruoyi-ui/src/directive/dialog/dragDialog.js index be31661..7c7104b 100644 --- a/ruoyi-ui/src/directive/dialog/dragDialog.js +++ b/ruoyi-ui/src/directive/dialog/dragDialog.js @@ -110,10 +110,8 @@ export default { if (!hasSetBodyHight) { const footerHeight = dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight dragDom.querySelector('.el-dialog__body').style.height = - 'calc(90% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)' - /* dragDom.querySelector('.el-dialog__body').style.height = - window.innerHeight*0.9 - - (dialogHeaderEl.offsetHeight + footerHeight) + 'px'*/ + 'calc(100% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)' + hasSetBodyHight = true } } @@ -124,44 +122,5 @@ export default { maxMin.onclick = setMaxMin; //双击头部效果 dialogHeaderEl.ondblclick = setMaxMin; - //拉伸 - let resizeEl = document.createElement("div"); - dragDom.appendChild(resizeEl); - //在弹窗右下角加上一个10-10px的控制块 - resizeEl.style.cursor = 'se-resize'; - resizeEl.style.position = 'absolute'; - resizeEl.style.height = '10px'; - resizeEl.style.width = '10px'; - resizeEl.style.right = '0px'; - resizeEl.style.bottom = '0px'; - resizeEl.style.zIndex = '99'; - //鼠标拉伸弹窗 - resizeEl.onmousedown = (e) => { - // 记录初始x位置 - const clientX = e.clientX; - // 鼠标按下，计算当前元素距离可视区的距离 - const disX = e.clientX - resizeEl.offsetLeft; - const disY = e.clientY - resizeEl.offsetTop; - document.onmousemove = function (e) { - e.preventDefault(); // 移动时禁用默认事件 - // 通过事件委托，计算移动的距离 - const x = e.clientX - disX + (e.clientX - clientX);//这里 由于elementUI的dialog控制居中的，所以水平拉伸效果是双倍 - const y = e.clientY - disY; - //比较是否小于最小宽高 - dragDom.style.width = x > minWidth ? `${x}px` : minWidth + 'px'; - dragDom.style.height = y > minHeight ? `${y}px` : minHeight + 'px'; - if (!hasSetBodyHight) { - const footerHeight = dragDom.querySelector('.el-dialog__footer') && dragDom.querySelector('.el-dialog__footer').offsetHeight - dragDom.querySelector('.el-dialog__body').style.height = 'calc(90% - ' + (dialogHeaderEl.offsetHeight + footerHeight) + 'px)' - hasSetBodyHight = true - } - }; - //拉伸结束 - document.onmouseup = function (e) { - document.onmousemove = null; - document.onmouseup = null; - el.dispatchEvent(resizeEvent); - }; - } } } diff --git a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue index 76da996..4c56c97 100644 --- a/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue +++ b/ruoyi-ui/src/views/priceVerification/priceVerification/hjInfo.vue @@ -1,6 +1,6 @@ @@ -265,14 +286,27 @@ width: 100% !important; } +